summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-07-11 18:40:37 +0200
committerwm4 <wm4@nowhere>2015-07-11 20:01:28 +0200
commit898855cc0d076e4132140abce5913c298de83a00 (patch)
tree8b65242f9c1dbb36665b0e074e0f4a16ec73c9ad
parent5776b0c9408294815869bc447628bd77baaab226 (diff)
downloadmpv-898855cc0d076e4132140abce5913c298de83a00.tar.bz2
mpv-898855cc0d076e4132140abce5913c298de83a00.tar.xz
vo_opengl: reduce verbose output
Outputting the detected OpenGL features was useless and redundant with the extension loading output. Also, remove MPGL_CAP_3D_TEX from OpenGL(ES) 3.0. This block didn't include the glTexImage3D function, so that was pointless and couldn't have worked. The OpenGL 2.1 block does it correctly.
-rw-r--r--video/out/gl_common.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/video/out/gl_common.c b/video/out/gl_common.c
index c127f16fa3..d497cd2613 100644
--- a/video/out/gl_common.c
+++ b/video/out/gl_common.c
@@ -44,23 +44,6 @@
#include "options/options.h"
#include "options/m_option.h"
-struct feature {
- int id;
- const char *name;
-};
-
-static const struct feature features[] = {
- {MPGL_CAP_FB, "Framebuffers"},
- {MPGL_CAP_VAO, "VAOs"},
- {MPGL_CAP_FLOAT_TEX, "Float textures"},
- {MPGL_CAP_TEX_RG, "RG textures"},
- {MPGL_CAP_1D_TEX, "1D textures"},
- {MPGL_CAP_3D_TEX, "3D textures"},
- {MPGL_CAP_DEBUG, "debugging extensions"},
- {MPGL_CAP_SW, "suspected software renderer"},
- {0},
-};
-
// This guesses if the current GL context is a suspected software renderer.
static bool is_software_gl(GL *gl)
{
@@ -189,7 +172,6 @@ static const struct gl_functions gl_functions[] = {
{
.ver_core = 300,
.ver_es_core = 300,
- .provides = MPGL_CAP_3D_TEX,
.functions = (const struct gl_function[]) {
DEF_FN(GetStringi),
// for ES 3.0
@@ -496,15 +478,9 @@ void mpgl_load_functions2(GL *gl, void *(*get_fn)(void *ctx, const char *n),
gl->glsl_version = 150;
}
- if (is_software_gl(gl))
+ if (is_software_gl(gl)) {
gl->mpgl_caps |= MPGL_CAP_SW;
-
- if (gl->mpgl_caps) {
- mp_verbose(log, "Detected OpenGL features:\n");
- for (const struct feature *f = &features[0]; f->id; f++) {
- if ((f->id & gl->mpgl_caps))
- mp_verbose(log, " - %s\n", f->name);
- }
+ mp_verbose(log, "Detected suspected software renderer.\n");
}
// Provided for simpler handling if no framebuffer support is available.