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

(GL) Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-09-01 19:54:41 +02:00
parent 7dff69808a
commit e810b0251a
3 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/common/gl_common.h
View File

@ -26,7 +26,6 @@
#include "../../config.h" #include "../../config.h"
#endif #endif
#include <retro_inline.h>
#include <gfx/math/matrix_4x4.h> #include <gfx/math/matrix_4x4.h>
#include <gfx/scaler/scaler.h> #include <gfx/scaler/scaler.h>
#include <glsym/glsym.h> #include <glsym/glsym.h>
@ -258,15 +257,12 @@ struct gl
bool pbo_readback_enable; bool pbo_readback_enable;
}; };
static INLINE void gl_bind_texture(GLuint id, GLint wrap_mode, GLint mag_filter, #define GL_BIND_TEXTURE(id, wrap_mode, mag_filter, min_filter) \
GLint min_filter) glBindTexture(GL_TEXTURE_2D, id); \
{ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_mode); \
glBindTexture(GL_TEXTURE_2D, id); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap_mode); \
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_mode); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter); \
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap_mode); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
}
bool gl_query_core_context_in_use(void); bool gl_query_core_context_in_use(void);

44
gfx/drivers/gl.c
View File

@ -87,7 +87,7 @@
#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 #define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
#endif #endif
#define set_texture_coords(coords, xamt, yamt) \ #define SET_TEXTURE_COORDS(coords, xamt, yamt) \
coords[2] = xamt; \ coords[2] = xamt; \
coords[6] = xamt; \ coords[6] = xamt; \
coords[5] = yamt; \ coords[5] = yamt; \
@ -159,14 +159,12 @@ typedef struct __GLsync *GLsync;
typedef struct gl2_renderchain_data typedef struct gl2_renderchain_data
{ {
bool egl_images;
bool has_fp_fbo;
bool has_srgb_fbo_gles3;
bool has_srgb_fbo;
bool hw_render_depth_init;
int fbo_pass; int fbo_pass;
#ifdef HAVE_GL_SYNC
GLsync fences[MAX_FENCES];
#endif
GLuint vao; GLuint vao;
GLuint fbo[GFX_MAX_SHADERS]; GLuint fbo[GFX_MAX_SHADERS];
GLuint fbo_texture[GFX_MAX_SHADERS]; GLuint fbo_texture[GFX_MAX_SHADERS];
@ -174,11 +172,13 @@ typedef struct gl2_renderchain_data
unsigned fence_count; unsigned fence_count;
#ifdef HAVE_GL_SYNC
GLsync fences[MAX_FENCES];
#endif
struct gfx_fbo_scale fbo_scale[GFX_MAX_SHADERS]; struct gfx_fbo_scale fbo_scale[GFX_MAX_SHADERS];
bool egl_images;
bool has_fp_fbo;
bool has_srgb_fbo_gles3;
bool has_srgb_fbo;
bool hw_render_depth_init;
} gl2_renderchain_data_t; } gl2_renderchain_data_t;
#if (!defined(HAVE_OPENGLES) || defined(HAVE_OPENGLES3)) #if (!defined(HAVE_OPENGLES) || defined(HAVE_OPENGLES3))
@ -187,12 +187,6 @@ typedef struct gl2_renderchain_data
#endif #endif
#endif #endif
#define set_texture_coords(coords, xamt, yamt) \
coords[2] = xamt; \
coords[6] = xamt; \
coords[5] = yamt; \
coords[7] = yamt
#if defined(HAVE_PSGL) #if defined(HAVE_PSGL)
#define gl2_fb_texture_2d(a, b, c, d, e) glFramebufferTexture2DOES(a, b, c, d, e) #define gl2_fb_texture_2d(a, b, c, d, e) glFramebufferTexture2DOES(a, b, c, d, e)
#define gl2_check_fb_status(target) glCheckFramebufferStatusOES(target) #define gl2_check_fb_status(target) glCheckFramebufferStatusOES(target)
@ -512,7 +506,7 @@ static void gl2_renderchain_render(
xamt = (GLfloat)prev_rect->img_width / prev_rect->width; xamt = (GLfloat)prev_rect->img_width / prev_rect->width;
yamt = (GLfloat)prev_rect->img_height / prev_rect->height; yamt = (GLfloat)prev_rect->img_height / prev_rect->height;
set_texture_coords(fbo_tex_coords, xamt, yamt); SET_TEXTURE_COORDS(fbo_tex_coords, xamt, yamt);
fbo_info->tex = chain->fbo_texture[i - 1]; fbo_info->tex = chain->fbo_texture[i - 1];
fbo_info->input_size[0] = prev_rect->img_width; fbo_info->input_size[0] = prev_rect->img_width;
@ -575,7 +569,7 @@ static void gl2_renderchain_render(
xamt = (GLfloat)prev_rect->img_width / prev_rect->width; xamt = (GLfloat)prev_rect->img_width / prev_rect->width;
yamt = (GLfloat)prev_rect->img_height / prev_rect->height; yamt = (GLfloat)prev_rect->img_height / prev_rect->height;
set_texture_coords(fbo_tex_coords, xamt, yamt); SET_TEXTURE_COORDS(fbo_tex_coords, xamt, yamt);
/* Push final FBO to list. */ /* Push final FBO to list. */
fbo_info = &fbo_tex_info[chain->fbo_pass - 1]; fbo_info = &fbo_tex_info[chain->fbo_pass - 1];
@ -809,7 +803,7 @@ static void gl2_create_fbo_texture(gl_t *gl,
wrap_enum = gl2_wrap_type_to_enum(wrap_type); wrap_enum = gl2_wrap_type_to_enum(wrap_type);
gl_bind_texture(texture, wrap_enum, mag_filter, min_filter); GL_BIND_TEXTURE(texture, wrap_enum, mag_filter, min_filter);
fp_fbo = chain->fbo_scale[i].fp_fbo; fp_fbo = chain->fbo_scale[i].fp_fbo;
@ -1700,7 +1694,7 @@ static void gl_load_texture_data(
break; break;
} }
gl_bind_texture(id, wrap, mag_filter, min_filter); GL_BIND_TEXTURE(id, wrap, mag_filter, min_filter);
glPixelStorei(GL_UNPACK_ALIGNMENT, alignment); glPixelStorei(GL_UNPACK_ALIGNMENT, alignment);
glTexImage2D(GL_TEXTURE_2D, glTexImage2D(GL_TEXTURE_2D,
@ -2149,7 +2143,7 @@ static void gl2_update_input_size(gl_t *gl, unsigned width,
xamt = (float)width / gl->tex_w; xamt = (float)width / gl->tex_w;
yamt = (float)height / gl->tex_h; yamt = (float)height / gl->tex_h;
set_texture_coords(gl->tex_info.coord, xamt, yamt); SET_TEXTURE_COORDS(gl->tex_info.coord, xamt, yamt);
} }
static void gl2_init_textures_data(gl_t *gl) static void gl2_init_textures_data(gl_t *gl)
@ -2216,7 +2210,7 @@ static void gl2_init_textures(gl_t *gl)
for (i = 0; i < gl->textures; i++) for (i = 0; i < gl->textures; i++)
{ {
gl_bind_texture(gl->texture[i], gl->wrap_mode, gl->tex_mag_filter, GL_BIND_TEXTURE(gl->texture[i], gl->wrap_mode, gl->tex_mag_filter,
gl->tex_min_filter); gl->tex_min_filter);
gl2_renderchain_init_texture_reference( gl2_renderchain_init_texture_reference(
@ -2994,7 +2988,7 @@ static bool gl2_frame(void *data, const void *frame,
feedback_info.tex_size[0] = rect->width; feedback_info.tex_size[0] = rect->width;
feedback_info.tex_size[1] = rect->height; feedback_info.tex_size[1] = rect->height;
set_texture_coords(feedback_info.coord, xamt, yamt); SET_TEXTURE_COORDS(feedback_info.coord, xamt, yamt);
} }
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
@ -4043,7 +4037,7 @@ static void gl2_update_tex_filter_frame(gl_t *gl)
if (!gl->texture[i]) if (!gl->texture[i])
continue; continue;
gl_bind_texture(gl->texture[i], gl->wrap_mode, gl->tex_mag_filter, GL_BIND_TEXTURE(gl->texture[i], gl->wrap_mode, gl->tex_mag_filter,
gl->tex_min_filter); gl->tex_min_filter);
} }

2
gfx/drivers_font/gl_raster_font.c
View File

@ -207,7 +207,7 @@ static void *gl_raster_font_init_font(void *data,
glGenTextures(1, &font->tex); glGenTextures(1, &font->tex);
gl_bind_texture(font->tex, GL_CLAMP_TO_EDGE, GL_LINEAR, GL_LINEAR); GL_BIND_TEXTURE(font->tex, GL_CLAMP_TO_EDGE, GL_LINEAR, GL_LINEAR);
font->atlas = font->font_driver->get_atlas(font->font_data); font->atlas = font->font_driver->get_atlas(font->font_data);
font->tex_width = next_pow2(font->atlas->width); font->tex_width = next_pow2(font->atlas->width);