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

Merge pull request #2487 from heuripedes/master

Browse Source 
(gl) Add checks for full npot support
This commit is contained in:
Twinaphex 2015-11-28 01:31:38 +01:00
commit fedae36d9b
2 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/common/gl_common.h
View File

@ -253,6 +253,7 @@ typedef struct gl
#else #else
bool have_es2_compat; bool have_es2_compat;
#endif #endif
bool have_full_npot_support;
bool egl_images; bool egl_images;
video_info_t video_info; video_info_t video_info;

55
gfx/drivers/gl.c
View File

@ -2018,6 +2018,7 @@ static bool resolve_extensions(gl_t *gl, const char *context_ident)
#if defined(HAVE_GL_SYNC) || defined(HAVE_FBO) #if defined(HAVE_GL_SYNC) || defined(HAVE_FBO)
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
#endif #endif
unsigned major = 0, minor = 0;
(void)vendor; (void)vendor;
(void)renderer; (void)renderer;
@ -2037,6 +2038,9 @@ static bool resolve_extensions(gl_t *gl, const char *context_ident)
} }
} }
if (version && sscanf(version, "%u.%u", &major, &minor) != 2)
major = minor = 0;
/* GL_RGB565 internal format support. /* GL_RGB565 internal format support.
* Even though ES2 support is claimed, the format * Even though ES2 support is claimed, the format
* is not supported on older ATI catalyst drivers. * is not supported on older ATI catalyst drivers.
@ -2049,6 +2053,24 @@ static bool resolve_extensions(gl_t *gl, const char *context_ident)
RARCH_LOG("[GL]: ATI card detected, skipping check for GL_RGB565 support.\n"); RARCH_LOG("[GL]: ATI card detected, skipping check for GL_RGB565 support.\n");
else else
gl->have_es2_compat = gl_query_extension(gl, "ARB_ES2_compatibility"); gl->have_es2_compat = gl_query_extension(gl, "ARB_ES2_compatibility");
if (major >= 3)
gl->have_full_npot_support = true;
else
{ /* try to detect actual npot support. might fail for older cards. */
GLint max_texture_size = 0;
GLint max_native_instr = 0;
bool arb_npot = gl_query_extension(gl, "ARB_texture_non_power_of_two");
bool arb_frag_program = gl_query_extension(gl, "ARB_fragment_program");
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);
if (arb_frag_program)
glGetIntegerv(GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, &max_native_instr);
gl->have_full_npot_support = arb_npot && arb_frag_program &&
(max_texture_size >= 8192) && (max_native_instr >= 4096);
}
#endif #endif
#ifdef HAVE_GL_SYNC #ifdef HAVE_GL_SYNC
@ -2058,9 +2080,30 @@ static bool resolve_extensions(gl_t *gl, const char *context_ident)
#endif #endif
video_driver_ctl(RARCH_DISPLAY_CTL_UNSET_RGBA, NULL); video_driver_ctl(RARCH_DISPLAY_CTL_UNSET_RGBA, NULL);
#ifdef HAVE_OPENGLES2 #if defined(HAVE_OPENGLES) || defined(HAVE_OPENGLES2)
bool gles3 = false; bool gles3 = false;
unsigned gles_major = 0, gles_minor = 0;
if (version && sscanf(version, "OpenGL ES %u.%u", &major, &minor) != 2)
major = minor = 0;
if (major >= 3)
{
RARCH_LOG("[GL]: GLES3 or newer detected. Auto-enabling some extensions.\n");
gles3 = true;
}
if (gles3)
gl->have_full_npot_support = true;
else
{
bool arb_npot = gl_query_extension(gl, "ARB_texture_non_power_of_two");
bool oes_npot = gl_query_extension(gl, "OES_texture_npot");
gl->have_full_npot_support = arb_npot || oes_npot;
}
#endif
#ifdef HAVE_OPENGLES2
/* There are both APPLE and EXT variants. */ /* There are both APPLE and EXT variants. */
/* Videocore hardware supports BGRA8888 extension, but /* Videocore hardware supports BGRA8888 extension, but
@ -2074,14 +2117,6 @@ static bool resolve_extensions(gl_t *gl, const char *context_ident)
"32-bit path will require conversion.\n"); "32-bit path will require conversion.\n");
} }
/* This format is mandated by GLES. */
if (version && sscanf(version, "OpenGL ES %u.%u",
&gles_major, &gles_minor) == 2 && gles_major >= 3)
{
RARCH_LOG("[GL]: GLES3 or newer detected. Auto-enabling some extensions.\n");
gles3 = true;
}
/* GLES3 has unpack_subimage and sRGB in core. */ /* GLES3 has unpack_subimage and sRGB in core. */
gl->support_unpack_row_length = gles3; gl->support_unpack_row_length = gles3;