libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-03-03 07:18:56 +00:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-09-09 01:18:40 +02:00
parent 36e0ff8268
commit 0488415329
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gfx/common/gl_common.h
View File

@ -90,14 +90,9 @@ typedef struct gl
int version_minor; int version_minor;
int fbo_pass; int fbo_pass;
GLuint texture[GFX_MAX_TEXTURES];
GLuint tex_mag_filter; GLuint tex_mag_filter;
GLuint tex_min_filter; GLuint tex_min_filter;
#ifdef HAVE_FBO #ifdef HAVE_FBO
GLuint fbo[GFX_MAX_SHADERS];
GLuint fbo_texture[GFX_MAX_SHADERS];
GLuint hw_render_fbo[GFX_MAX_TEXTURES];
GLuint hw_render_depth[GFX_MAX_TEXTURES];
GLuint fbo_feedback; GLuint fbo_feedback;
GLuint fbo_feedback_texture; GLuint fbo_feedback_texture;
#endif #endif
@ -105,13 +100,20 @@ typedef struct gl
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
GLuint *overlay_tex; GLuint *overlay_tex;
#endif #endif
#ifdef HAVE_GL_ASYNC_READBACK
GLuint pbo_readback[4];
#endif
#if defined(HAVE_MENU) #if defined(HAVE_MENU)
GLuint menu_texture; GLuint menu_texture;
#endif #endif
GLuint vao; GLuint vao;
#ifdef HAVE_GL_ASYNC_READBACK
GLuint pbo_readback[4];
#endif
GLuint texture[GFX_MAX_TEXTURES];
#ifdef HAVE_FBO
GLuint fbo[GFX_MAX_SHADERS];
GLuint fbo_texture[GFX_MAX_SHADERS];
GLuint hw_render_fbo[GFX_MAX_TEXTURES];
GLuint hw_render_depth[GFX_MAX_TEXTURES];
#endif
unsigned tex_index; /* For use with PREV. */ unsigned tex_index; /* For use with PREV. */
unsigned textures; unsigned textures;
@ -123,8 +125,6 @@ typedef struct gl
unsigned vp_out_height; unsigned vp_out_height;
unsigned tex_w; unsigned tex_w;
unsigned tex_h; unsigned tex_h;
unsigned last_width[GFX_MAX_TEXTURES];
unsigned last_height[GFX_MAX_TEXTURES];
unsigned base_size; /* 2 or 4 */ unsigned base_size; /* 2 or 4 */
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
unsigned overlays; unsigned overlays;
@ -135,6 +135,8 @@ typedef struct gl
#ifdef HAVE_GL_SYNC #ifdef HAVE_GL_SYNC
unsigned fence_count; unsigned fence_count;
#endif #endif
unsigned last_width[GFX_MAX_TEXTURES];
unsigned last_height[GFX_MAX_TEXTURES];
#if defined(HAVE_MENU) #if defined(HAVE_MENU)
float menu_texture_alpha; float menu_texture_alpha;
@ -152,11 +154,6 @@ typedef struct gl
#endif #endif
struct video_tex_info tex_info; struct video_tex_info tex_info;
struct video_tex_info prev_info[GFX_MAX_TEXTURES];
#ifdef HAVE_FBO
struct video_fbo_rect fbo_rect[GFX_MAX_SHADERS];
struct gfx_fbo_scale fbo_scale[GFX_MAX_SHADERS];
#endif
#ifdef HAVE_GL_ASYNC_READBACK #ifdef HAVE_GL_ASYNC_READBACK
struct scaler_ctx pbo_readback_scaler; struct scaler_ctx pbo_readback_scaler;
#endif #endif
@ -165,6 +162,11 @@ typedef struct gl
struct video_coords coords; struct video_coords coords;
struct scaler_ctx scaler; struct scaler_ctx scaler;
video_info_t video_info; video_info_t video_info;
struct video_tex_info prev_info[GFX_MAX_TEXTURES];
#ifdef HAVE_FBO
struct video_fbo_rect fbo_rect[GFX_MAX_SHADERS];
struct gfx_fbo_scale fbo_scale[GFX_MAX_SHADERS];
#endif
#ifdef HAVE_GL_SYNC #ifdef HAVE_GL_SYNC
GLsync fences[MAX_FENCES]; GLsync fences[MAX_FENCES];