ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cut down on gl_check_capability calls

This commit is contained in:
twinaphex 2017-11-08 00:49:01 +01:00
parent 4cae577ade
commit 0085b24fd5
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/common/gl_common.h
View File

@ -63,6 +63,7 @@ typedef struct gl
bool support_unpack_row_length; bool support_unpack_row_length;
bool have_es2_compat; bool have_es2_compat;
bool have_full_npot_support; bool have_full_npot_support;
bool have_mipmap;
bool egl_images; bool egl_images;
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY

8
gfx/drivers/gl.c
View File

@ -827,12 +827,13 @@ void gl_load_texture_data(
bool rgb32 = (base_size == (sizeof(uint32_t))); bool rgb32 = (base_size == (sizeof(uint32_t)));
GLenum wrap = gl_wrap_type_to_enum(wrap_type); GLenum wrap = gl_wrap_type_to_enum(wrap_type);
GLuint id = (GLuint)id_data; GLuint id = (GLuint)id_data;
bool have_mipmap = gl_check_capability(GL_CAPS_MIPMAP);
glBindTexture(GL_TEXTURE_2D, id); glBindTexture(GL_TEXTURE_2D, id);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap);
if (!gl_check_capability(GL_CAPS_MIPMAP)) if (!have_mipmap)
{ {
/* Assume no mipmapping support. */ /* Assume no mipmapping support. */
switch (filter_type) switch (filter_type)
@ -882,7 +883,7 @@ void gl_load_texture_data(
(use_rgba || !rgb32) ? GL_RGBA : RARCH_GL_TEXTURE_TYPE32, (use_rgba || !rgb32) ? GL_RGBA : RARCH_GL_TEXTURE_TYPE32,
(rgb32) ? RARCH_GL_FORMAT32 : GL_UNSIGNED_SHORT_4_4_4_4, frame); (rgb32) ? RARCH_GL_FORMAT32 : GL_UNSIGNED_SHORT_4_4_4_4, frame);
if (want_mipmap && gl_check_capability(GL_CAPS_MIPMAP)) if (want_mipmap && have_mipmap)
glGenerateMipmap(GL_TEXTURE_2D); glGenerateMipmap(GL_TEXTURE_2D);
} }
@ -1249,7 +1250,7 @@ static bool gl_frame(void *data, const void *frame,
/* No point regenerating mipmaps /* No point regenerating mipmaps
* if there are no new frames. */ * if there are no new frames. */
if (gl->tex_mipmap && gl_check_capability(GL_CAPS_MIPMAP)) if (gl->tex_mipmap && gl->have_mipmap)
glGenerateMipmap(GL_TEXTURE_2D); glGenerateMipmap(GL_TEXTURE_2D);
} }
@ -1591,6 +1592,7 @@ static bool resolve_extensions(gl_t *gl, const char *context_ident)
*/ */
gl->have_full_npot_support = gl_check_capability(GL_CAPS_FULL_NPOT_SUPPORT); gl->have_full_npot_support = gl_check_capability(GL_CAPS_FULL_NPOT_SUPPORT);
#endif #endif
gl->have_mipmap = gl_check_capability(GL_CAPS_MIPMAP);
gl->have_es2_compat = gl_check_capability(GL_CAPS_ES2_COMPAT); gl->have_es2_compat = gl_check_capability(GL_CAPS_ES2_COMPAT);
gl->have_sync = gl_check_capability(GL_CAPS_SYNC); gl->have_sync = gl_check_capability(GL_CAPS_SYNC);

4
gfx/drivers_renderchain/gl2_renderchain.c
View File

@ -294,7 +294,7 @@ static void gl2_renderchain_render(
mip_level = i + 1; mip_level = i + 1;
if (video_shader_driver_mipmap_input(&mip_level) if (video_shader_driver_mipmap_input(&mip_level)
&& gl_check_capability(GL_CAPS_MIPMAP)) && gl->have_mipmap)
glGenerateMipmap(GL_TEXTURE_2D); glGenerateMipmap(GL_TEXTURE_2D);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
@ -371,7 +371,7 @@ static void gl2_renderchain_render(
mip_level = gl->fbo_pass + 1; mip_level = gl->fbo_pass + 1;
if (video_shader_driver_mipmap_input(&mip_level) if (video_shader_driver_mipmap_input(&mip_level)
&& gl_check_capability(GL_CAPS_MIPMAP)) && gl->have_mipmap)
glGenerateMipmap(GL_TEXTURE_2D); glGenerateMipmap(GL_TEXTURE_2D);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);