RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-09 07:38:22 +00:00
Code Issues Releases Wiki Activity

vo_opengl: make ES float texture format checks stricter

Browse Source 
Some of these checks became pointless after dropping ES 2.0 support for
extended filtering.

GL_EXT_texture_rg is part of core in ES 3.0, and we already check for
this version, so testing for the extension is redundant.

GL_OES_texture_half_float_linear is also always available, at least as
far as our needs go.

The functionality we need from GL_EXT_color_buffer_half_float is always
available in ES 3.2, and we explicitly check for ES 3.2, so reject this
extension if the ES version is new enough.
This commit is contained in:
wm4 2016-05-23 19:29:08 +02:00
parent 80d702dce8
commit 049e3ccb65
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
video/out/opengl/common.c
View File

@ -256,17 +256,12 @@ static const struct gl_functions gl_functions[] = {
.ver_exclude = 300, .ver_exclude = 300,
.ver_es_exclude = 1, .ver_es_exclude = 1,
}, },
// 16 bit float textures filterable with GL_LINEAR in GLES
{
.extension = "GL_OES_texture_half_float_linear",
.provides = MPGL_CAP_OES_HFLOAT_LIN,
.ver_exclude = 1,
},
// 16 bit float textures that can be rendered to in GLES // 16 bit float textures that can be rendered to in GLES
{ {
.extension = "GL_EXT_color_buffer_half_float", .extension = "GL_EXT_color_buffer_half_float",
.provides = MPGL_CAP_EXT_CR_HFLOAT, .provides = MPGL_CAP_EXT_CR_HFLOAT,
.ver_exclude = 1, .ver_exclude = 1,
.ver_es_exclude = 320,
}, },
{ {
.ver_core = 320, .ver_core = 320,

1
video/out/opengl/common.h
View File

@ -63,7 +63,6 @@ enum {
MPGL_CAP_EXT16 = (1 << 18), // GL_EXT_texture_norm16 MPGL_CAP_EXT16 = (1 << 18), // GL_EXT_texture_norm16
MPGL_CAP_ARB_FLOAT = (1 << 19), // GL_ARB_texture_float MPGL_CAP_ARB_FLOAT = (1 << 19), // GL_ARB_texture_float
MPGL_CAP_EXT_CR_HFLOAT = (1 << 20), // GL_EXT_color_buffer_half_float MPGL_CAP_EXT_CR_HFLOAT = (1 << 20), // GL_EXT_color_buffer_half_float
MPGL_CAP_OES_HFLOAT_LIN = (1 << 21), // GL_OES_texture_half_float_linear
MPGL_CAP_SW = (1 << 30), // indirect or sw renderer MPGL_CAP_SW = (1 << 30), // indirect or sw renderer
}; };

4
video/out/opengl/formats.c
View File

@ -116,9 +116,7 @@ int gl_format_feature_flags(GL *gl)
| (gl->es >= 320 ? F_ES32 : 0) | (gl->es >= 320 ? F_ES32 : 0)
| (gl->mpgl_caps & MPGL_CAP_EXT16 ? F_EXT16 : 0) | (gl->mpgl_caps & MPGL_CAP_EXT16 ? F_EXT16 : 0)
| ((gl->es >= 300 && | ((gl->es >= 300 &&
(gl->mpgl_caps & MPGL_CAP_TEX_RG) && (gl->mpgl_caps & MPGL_CAP_EXT_CR_HFLOAT)) ? F_EXTF16 : 0)
(gl->mpgl_caps & MPGL_CAP_EXT_CR_HFLOAT) &&
(gl->mpgl_caps & MPGL_CAP_OES_HFLOAT_LIN)) ? F_EXTF16 : 0)
| ((gl->version == 210 && | ((gl->version == 210 &&
(gl->mpgl_caps & MPGL_CAP_ARB_FLOAT) && (gl->mpgl_caps & MPGL_CAP_ARB_FLOAT) &&
(gl->mpgl_caps & MPGL_CAP_TEX_RG) && (gl->mpgl_caps & MPGL_CAP_TEX_RG) &&

3
video/out/opengl/formats.h
View File

@ -23,8 +23,7 @@ enum {
F_ES3 = 1 << 3, // ES3.0 or later F_ES3 = 1 << 3, // ES3.0 or later
F_ES32 = 1 << 4, // ES3.2 or later F_ES32 = 1 << 4, // ES3.2 or later
F_EXT16 = 1 << 5, // ES with GL_EXT_texture_norm16 F_EXT16 = 1 << 5, // ES with GL_EXT_texture_norm16
F_EXTF16 = 1 << 6, // GL_OES_texture_half_float_linear + F_EXTF16 = 1 << 6, // GL_EXT_color_buffer_half_float
// GL_EXT_color_buffer_half_float
F_GL2F = 1 << 7, // GL2.1-only with texture_rg + texture_float + FBOs F_GL2F = 1 << 7, // GL2.1-only with texture_rg + texture_float + FBOs
F_APPL = 1 << 8, // GL_APPLE_rgb_422 F_APPL = 1 << 8, // GL_APPLE_rgb_422