mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorder structs, alignment

Browse Source
This commit is contained in:
twinaphex 2020-08-17 15:09:19 +02:00
parent 855351de9e
commit c81d06d0a1
2 changed files with 84 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
gfx/common/gl_common.h
View File

@ -159,11 +159,77 @@ typedef struct gl gl_t;
struct gl struct gl
{ {
const shader_backend_t *shader;
void *shader_data;
void *renderchain_data;
void *ctx_data;
const gfx_ctx_driver_t *ctx_driver;
void *empty_buf;
void *conv_buffer;
void *readback_buffer_screenshot;
const float *vertex_ptr;
const float *white_color_ptr;
float *overlay_vertex_coord;
float *overlay_tex_coord;
float *overlay_color_coord;
int version_major;
int version_minor;
GLuint tex_mag_filter;
GLuint tex_min_filter;
GLuint fbo_feedback;
GLuint fbo_feedback_texture;
GLuint pbo;
GLuint *overlay_tex;
GLuint menu_texture;
GLuint pbo_readback[4];
GLuint texture[GFX_MAX_TEXTURES];
GLuint hw_render_fbo[GFX_MAX_TEXTURES];
#ifdef HAVE_VIDEO_LAYOUT
GLuint video_layout_fbo;
GLuint video_layout_fbo_texture;
GLuint video_layout_white_texture;
#endif
unsigned video_width;
unsigned video_height;
unsigned tex_index; /* For use with PREV. */
unsigned textures;
unsigned fbo_feedback_pass;
unsigned rotation;
unsigned vp_out_width;
unsigned vp_out_height;
unsigned tex_w;
unsigned tex_h;
unsigned base_size; /* 2 or 4 */
unsigned overlays;
unsigned pbo_readback_index;
unsigned last_width[GFX_MAX_TEXTURES];
unsigned last_height[GFX_MAX_TEXTURES];
float menu_texture_alpha;
GLenum internal_fmt; GLenum internal_fmt;
GLenum texture_type; /* RGB565 or ARGB */ GLenum texture_type; /* RGB565 or ARGB */
GLenum texture_fmt; GLenum texture_fmt;
GLenum wrap_mode; GLenum wrap_mode;
struct scaler_ctx pbo_readback_scaler;
struct video_viewport vp; /* int alignment */
math_matrix_4x4 mvp, mvp_no_rot;
struct video_coords coords; /* ptr alignment */
struct scaler_ctx scaler;
video_info_t video_info;
struct video_tex_info tex_info; /* unsigned int alignment */
struct video_tex_info prev_info[GFX_MAX_TEXTURES]; /* unsigned alignment */
struct video_fbo_rect fbo_rect[GFX_MAX_SHADERS]; /* unsigned alignment */
#ifdef HAVE_VIDEO_LAYOUT
bool video_layout_resize;
#endif
bool vsync; bool vsync;
bool tex_mipmap; bool tex_mipmap;
bool fbo_inited; bool fbo_inited;
@ -190,71 +256,6 @@ struct gl
bool have_sync; bool have_sync;
bool pbo_readback_valid[4]; bool pbo_readback_valid[4];
bool pbo_readback_enable; bool pbo_readback_enable;
int version_major;
int version_minor;
GLuint tex_mag_filter;
GLuint tex_min_filter;
GLuint fbo_feedback;
GLuint fbo_feedback_texture;
GLuint pbo;
GLuint *overlay_tex;
GLuint menu_texture;
GLuint pbo_readback[4];
GLuint texture[GFX_MAX_TEXTURES];
GLuint hw_render_fbo[GFX_MAX_TEXTURES];
#ifdef HAVE_VIDEO_LAYOUT
bool video_layout_resize;
GLuint video_layout_fbo;
GLuint video_layout_fbo_texture;
GLuint video_layout_white_texture;
#endif
unsigned video_width;
unsigned video_height;
unsigned tex_index; /* For use with PREV. */
unsigned textures;
unsigned fbo_feedback_pass;
unsigned rotation;
unsigned vp_out_width;
unsigned vp_out_height;
unsigned tex_w;
unsigned tex_h;
unsigned base_size; /* 2 or 4 */
unsigned overlays;
unsigned pbo_readback_index;
unsigned last_width[GFX_MAX_TEXTURES];
unsigned last_height[GFX_MAX_TEXTURES];
float menu_texture_alpha;
void *empty_buf;
void *conv_buffer;
void *readback_buffer_screenshot;
const float *vertex_ptr;
const float *white_color_ptr;
float *overlay_vertex_coord;
float *overlay_tex_coord;
float *overlay_color_coord;
struct video_tex_info tex_info;
struct scaler_ctx pbo_readback_scaler;
struct video_viewport vp;
math_matrix_4x4 mvp, mvp_no_rot;
struct video_coords coords;
struct scaler_ctx scaler;
video_info_t video_info;
struct video_tex_info prev_info[GFX_MAX_TEXTURES];
struct video_fbo_rect fbo_rect[GFX_MAX_SHADERS];
const shader_backend_t *shader;
void *shader_data;
void *renderchain_data;
void *ctx_data;
const gfx_ctx_driver_t *ctx_driver;
}; };
static INLINE void gl_bind_texture(GLuint id, GLint wrap_mode, GLint mag_filter, static INLINE void gl_bind_texture(GLuint id, GLint wrap_mode, GLint mag_filter,

36
libretro-common/include/gfx/scaler/scaler.h
View File

@ -54,25 +54,13 @@ enum scaler_type
struct scaler_filter struct scaler_filter
{ {
int16_t *filter; int16_t *filter;
int filter_len; int *filter_pos;
int filter_stride; int filter_len;
int *filter_pos; int filter_stride;
}; };
struct scaler_ctx struct scaler_ctx
{ {
int in_width;
int in_height;
int in_stride;
int out_width;
int out_height;
int out_stride;
enum scaler_pix_fmt in_fmt;
enum scaler_pix_fmt out_fmt;
enum scaler_type scaler_type;
void (*scaler_horiz)(const struct scaler_ctx*, void (*scaler_horiz)(const struct scaler_ctx*,
const void*, int); const void*, int);
void (*scaler_vert)(const struct scaler_ctx*, void (*scaler_vert)(const struct scaler_ctx*,
@ -83,9 +71,7 @@ struct scaler_ctx
void (*in_pixconv)(void*, const void*, int, int, int, int); void (*in_pixconv)(void*, const void*, int, int, int, int);
void (*out_pixconv)(void*, const void*, int, int, int, int); void (*out_pixconv)(void*, const void*, int, int, int, int);
void (*direct_pixconv)(void*, const void*, int, int, int, int); void (*direct_pixconv)(void*, const void*, int, int, int, int);
struct scaler_filter horiz, vert; /* ptr alignment */
bool unscaled;
struct scaler_filter horiz, vert;
struct struct
{ {
@ -106,6 +92,20 @@ struct scaler_ctx
uint32_t *frame; uint32_t *frame;
int stride; int stride;
} output; } output;
int in_width;
int in_height;
int in_stride;
int out_width;
int out_height;
int out_stride;
enum scaler_pix_fmt in_fmt;
enum scaler_pix_fmt out_fmt;
enum scaler_type scaler_type;
bool unscaled;
}; };
bool scaler_ctx_gen_filter(struct scaler_ctx *ctx); bool scaler_ctx_gen_filter(struct scaler_ctx *ctx);