mirror of https://github.com/mpv-player/mpv
vo_opengl: don't test for arrays
Even the lowest supported GL versions have arrays. This test was for returning arrays from functions, which didn't work in lower GL versions, but we don't need it anymore.
This commit is contained in:
parent
b2ad2e2fd1
commit
aedea2a79f
|
@ -55,7 +55,6 @@ static const struct feature features[] = {
|
||||||
{MPGL_CAP_VAO, "VAOs"},
|
{MPGL_CAP_VAO, "VAOs"},
|
||||||
{MPGL_CAP_FLOAT_TEX, "Float textures"},
|
{MPGL_CAP_FLOAT_TEX, "Float textures"},
|
||||||
{MPGL_CAP_TEX_RG, "RG textures"},
|
{MPGL_CAP_TEX_RG, "RG textures"},
|
||||||
{MPGL_CAP_1ST_CLASS_ARRAYS, "1st class shader arrays"},
|
|
||||||
{MPGL_CAP_1D_TEX, "1D textures"},
|
{MPGL_CAP_1D_TEX, "1D textures"},
|
||||||
{MPGL_CAP_3D_TEX, "3D textures"},
|
{MPGL_CAP_3D_TEX, "3D textures"},
|
||||||
{MPGL_CAP_DEBUG, "debugging extensions"},
|
{MPGL_CAP_DEBUG, "debugging extensions"},
|
||||||
|
@ -168,8 +167,7 @@ static const struct gl_functions gl_functions[] = {
|
||||||
// GL 2.1+ desktop only (and GLSL 120 shaders)
|
// GL 2.1+ desktop only (and GLSL 120 shaders)
|
||||||
{
|
{
|
||||||
.ver_core = 210,
|
.ver_core = 210,
|
||||||
.provides = MPGL_CAP_ROW_LENGTH | MPGL_CAP_1D_TEX | MPGL_CAP_3D_TEX |
|
.provides = MPGL_CAP_ROW_LENGTH | MPGL_CAP_1D_TEX | MPGL_CAP_3D_TEX,
|
||||||
MPGL_CAP_1ST_CLASS_ARRAYS,
|
|
||||||
.functions = (const struct gl_function[]) {
|
.functions = (const struct gl_function[]) {
|
||||||
DEF_FN(DrawBuffer),
|
DEF_FN(DrawBuffer),
|
||||||
DEF_FN(GetTexLevelParameteriv),
|
DEF_FN(GetTexLevelParameteriv),
|
||||||
|
@ -185,7 +183,7 @@ static const struct gl_functions gl_functions[] = {
|
||||||
{
|
{
|
||||||
.ver_core = 300,
|
.ver_core = 300,
|
||||||
.ver_es_core = 300,
|
.ver_es_core = 300,
|
||||||
.provides = MPGL_CAP_3D_TEX | MPGL_CAP_1ST_CLASS_ARRAYS,
|
.provides = MPGL_CAP_3D_TEX,
|
||||||
.functions = (const struct gl_function[]) {
|
.functions = (const struct gl_function[]) {
|
||||||
DEF_FN(GetStringi),
|
DEF_FN(GetStringi),
|
||||||
// for ES 3.0
|
// for ES 3.0
|
||||||
|
|
|
@ -61,7 +61,6 @@ enum {
|
||||||
MPGL_CAP_TEX_RG = (1 << 10), // GL_ARB_texture_rg / GL 3.x
|
MPGL_CAP_TEX_RG = (1 << 10), // GL_ARB_texture_rg / GL 3.x
|
||||||
MPGL_CAP_VDPAU = (1 << 11), // GL_NV_vdpau_interop
|
MPGL_CAP_VDPAU = (1 << 11), // GL_NV_vdpau_interop
|
||||||
MPGL_CAP_APPLE_RGB_422 = (1 << 12), // GL_APPLE_rgb_422
|
MPGL_CAP_APPLE_RGB_422 = (1 << 12), // GL_APPLE_rgb_422
|
||||||
MPGL_CAP_1ST_CLASS_ARRAYS = (1 << 13),
|
|
||||||
MPGL_CAP_1D_TEX = (1 << 14),
|
MPGL_CAP_1D_TEX = (1 << 14),
|
||||||
MPGL_CAP_3D_TEX = (1 << 15),
|
MPGL_CAP_3D_TEX = (1 << 15),
|
||||||
MPGL_CAP_DEBUG = (1 << 16),
|
MPGL_CAP_DEBUG = (1 << 16),
|
||||||
|
|
|
@ -1924,7 +1924,6 @@ static void check_gl_features(struct gl_video *p)
|
||||||
GL *gl = p->gl;
|
GL *gl = p->gl;
|
||||||
bool have_float_tex = gl->mpgl_caps & MPGL_CAP_FLOAT_TEX;
|
bool have_float_tex = gl->mpgl_caps & MPGL_CAP_FLOAT_TEX;
|
||||||
bool have_fbo = gl->mpgl_caps & MPGL_CAP_FB;
|
bool have_fbo = gl->mpgl_caps & MPGL_CAP_FB;
|
||||||
bool have_arrays = gl->mpgl_caps & MPGL_CAP_1ST_CLASS_ARRAYS;
|
|
||||||
bool have_1d_tex = gl->mpgl_caps & MPGL_CAP_1D_TEX;
|
bool have_1d_tex = gl->mpgl_caps & MPGL_CAP_1D_TEX;
|
||||||
bool have_3d_tex = gl->mpgl_caps & MPGL_CAP_3D_TEX;
|
bool have_3d_tex = gl->mpgl_caps & MPGL_CAP_3D_TEX;
|
||||||
bool have_mix = gl->glsl_version >= 130;
|
bool have_mix = gl->glsl_version >= 130;
|
||||||
|
@ -1944,8 +1943,6 @@ static void check_gl_features(struct gl_video *p)
|
||||||
reason = "scaler (FBO)";
|
reason = "scaler (FBO)";
|
||||||
if (!have_float_tex)
|
if (!have_float_tex)
|
||||||
reason = "scaler (float tex.)";
|
reason = "scaler (float tex.)";
|
||||||
if (!have_arrays)
|
|
||||||
reason = "scaler (no GLSL support)";
|
|
||||||
if (!have_1d_tex && kernel->polar)
|
if (!have_1d_tex && kernel->polar)
|
||||||
reason = "scaler (1D tex.)";
|
reason = "scaler (1D tex.)";
|
||||||
if (reason) {
|
if (reason) {
|
||||||
|
|
Loading…
Reference in New Issue