notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adjust dma alignment and some cleanup
[pcsx_rearmed.git]
/
plugins
/
gpulib
/
gpu.h
diff --git
a/plugins/gpulib/gpu.h
b/plugins/gpulib/gpu.h
index
3bab7ff
..
13e73c5
100644
(file)
--- a/
plugins/gpulib/gpu.h
+++ b/
plugins/gpulib/gpu.h
@@
-8,17
+8,41
@@
* See the COPYING file in the top-level directory.
*/
* See the COPYING file in the top-level directory.
*/
+#ifndef __GPULIB_GPU_H__
+#define __GPULIB_GPU_H__
+
#include <stdint.h>
#include <stdint.h>
+//#define RAW_FB_DISPLAY
+
+#define gpu_log(fmt, ...) \
+ printf("%d:%03d: " fmt, *gpu.state.frame_count, *gpu.state.hcnt, ##__VA_ARGS__)
+
+//#define log_anomaly gpu_log
+#define log_anomaly(...)
+
#ifdef __cplusplus
extern "C" {
#endif
#define CMD_BUFFER_LEN 1024
#ifdef __cplusplus
extern "C" {
#endif
#define CMD_BUFFER_LEN 1024
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#define HTOLE32(x) __builtin_bswap32(x)
+#define HTOLE16(x) __builtin_bswap16(x)
+#define LE32TOH(x) __builtin_bswap32(x)
+#define LE16TOH(x) __builtin_bswap16(x)
+#else
+#define HTOLE32(x) (x)
+#define HTOLE16(x) (x)
+#define LE32TOH(x) (x)
+#define LE16TOH(x) (x)
+#endif
+
#define BIT(x) (1 << (x))
#define PSX_GPU_STATUS_DHEIGHT BIT(19)
#define BIT(x) (1 << (x))
#define PSX_GPU_STATUS_DHEIGHT BIT(19)
+#define PSX_GPU_STATUS_PAL BIT(20)
#define PSX_GPU_STATUS_RGB24 BIT(21)
#define PSX_GPU_STATUS_INTERLACE BIT(22)
#define PSX_GPU_STATUS_BLANKING BIT(23)
#define PSX_GPU_STATUS_RGB24 BIT(21)
#define PSX_GPU_STATUS_INTERLACE BIT(22)
#define PSX_GPU_STATUS_BLANKING BIT(23)
@@
-38,6
+62,7
@@
struct psx_gpu {
int x, y, w, h;
int x1, x2;
int y1, y2;
int x, y, w, h;
int x1, x2;
int y1, y2;
+ int src_x, src_y;
} screen;
struct {
int x, y, w, h;
} screen;
struct {
int x, y, w, h;
@@
-52,6
+77,10
@@
struct psx_gpu {
uint32_t blanked:1;
uint32_t enhancement_enable:1;
uint32_t enhancement_active:1;
uint32_t blanked:1;
uint32_t enhancement_enable:1;
uint32_t enhancement_active:1;
+ uint32_t enhancement_was_active:1;
+ uint32_t downscale_enable:1;
+ uint32_t downscale_active:1;
+ uint32_t dims_changed:1;
uint32_t *frame_count;
uint32_t *hcnt; /* hsync count */
struct {
uint32_t *frame_count;
uint32_t *hcnt; /* hsync count */
struct {
@@
-61,6
+90,11
@@
struct psx_gpu {
uint32_t hcnt;
} last_list;
uint32_t last_vram_read_frame;
uint32_t hcnt;
} last_list;
uint32_t last_vram_read_frame;
+ uint32_t w_out_old, h_out_old, status_vo_old;
+ short screen_centering_type;
+ short screen_centering_type_default;
+ int screen_centering_x;
+ int screen_centering_y;
} state;
struct {
int32_t set:3; /* -1 auto, 0 off, 1-3 fixed */
} state;
struct {
int32_t set:3; /* -1 auto, 0 off, 1-3 fixed */
@@
-72,28
+106,32
@@
struct psx_gpu {
uint32_t last_flip_frame;
uint32_t pending_fill[3];
} frameskip;
uint32_t last_flip_frame;
uint32_t pending_fill[3];
} frameskip;
- uint16_t *(*get_enhancement_bufer)
+ void *(*get_enhancement_bufer)
+ (int *x, int *y, int *w, int *h, int *vram_h);
+ uint16_t *(*get_downscale_buffer)
(int *x, int *y, int *w, int *h, int *vram_h);
void *(*mmap)(unsigned int size);
void (*munmap)(void *ptr, unsigned int size);
(int *x, int *y, int *w, int *h, int *vram_h);
void *(*mmap)(unsigned int size);
void (*munmap)(void *ptr, unsigned int size);
+ void (*gpu_state_change)(int what); // psx_gpu_state
};
extern struct psx_gpu gpu;
extern const unsigned char cmd_lengths[256];
};
extern struct psx_gpu gpu;
extern const unsigned char cmd_lengths[256];
-int do_cmd_list(uint32_t *list, int count, int *last_cmd);
+int do_cmd_list(uint32_t *list, int count, int *
cycles, int *
last_cmd);
struct rearmed_cbs;
int renderer_init(void);
void renderer_finish(void);
void renderer_sync_ecmds(uint32_t * ecmds);
struct rearmed_cbs;
int renderer_init(void);
void renderer_finish(void);
void renderer_sync_ecmds(uint32_t * ecmds);
-void renderer_update_caches(int x, int y, int w, int h);
+void renderer_update_caches(int x, int y, int w, int h
, int state_changed
);
void renderer_flush_queues(void);
void renderer_set_interlace(int enable, int is_odd);
void renderer_set_config(const struct rearmed_cbs *config);
void renderer_notify_res_change(void);
void renderer_flush_queues(void);
void renderer_set_interlace(int enable, int is_odd);
void renderer_set_config(const struct rearmed_cbs *config);
void renderer_notify_res_change(void);
+void renderer_notify_scanout_change(int x, int y);
int vout_init(void);
int vout_finish(void);
int vout_init(void);
int vout_finish(void);
@@
-107,7
+145,7
@@
struct GPUFreeze;
long GPUinit(void);
long GPUshutdown(void);
void GPUwriteDataMem(uint32_t *mem, int count);
long GPUinit(void);
long GPUshutdown(void);
void GPUwriteDataMem(uint32_t *mem, int count);
-long GPUdmaChain(uint32_t *rambase, uint32_t addr);
+long GPUdmaChain(uint32_t *rambase, uint32_t addr
, uint32_t *progress_addr
);
void GPUwriteData(uint32_t data);
void GPUreadDataMem(uint32_t *mem, int count);
uint32_t GPUreadData(void);
void GPUwriteData(uint32_t data);
void GPUreadDataMem(uint32_t *mem, int count);
uint32_t GPUreadData(void);
@@
-115,11
+153,14
@@
uint32_t GPUreadStatus(void);
void GPUwriteStatus(uint32_t data);
long GPUfreeze(uint32_t type, struct GPUFreeze *freeze);
void GPUupdateLace(void);
void GPUwriteStatus(uint32_t data);
long GPUfreeze(uint32_t type, struct GPUFreeze *freeze);
void GPUupdateLace(void);
-long GPUopen(
void **dpy
);
+long GPUopen(
unsigned long *disp, char *cap, char *cfg
);
long GPUclose(void);
void GPUvBlank(int is_vblank, int lcf);
long GPUclose(void);
void GPUvBlank(int is_vblank, int lcf);
+void GPUgetScreenInfo(int *y, int *base_hres);
void GPUrearmedCallbacks(const struct rearmed_cbs *cbs_);
#ifdef __cplusplus
}
#endif
void GPUrearmedCallbacks(const struct rearmed_cbs *cbs_);
#ifdef __cplusplus
}
#endif
+
+#endif /* __GPULIB_GPU_H__ */