summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-12 00:10:57 +0100
committerwm4 <wm4@nowhere>2012-11-12 00:27:26 +0100
commit0165ab5402c3ec472e877042b38cc03c952ac54c (patch)
tree3715cc3b0c25c7ef027bf8b98d4eea6093c27d0c
parenta55811790902b78915a1613f3551fe763ccda41a (diff)
downloadmpv-0165ab5402c3ec472e877042b38cc03c952ac54c.tar.bz2
mpv-0165ab5402c3ec472e877042b38cc03c952ac54c.tar.xz
vo_opengl: fix compatibility with OpenGL 2.1
The srgb_compand() function passes bvec to mix(), which is apparently not available on GL 2.1 / GLSL 1.20: 0:0(0): error: no matching function for call to `mix(vec3, vec3, bvec3)' 0:0(0): error: candidates are: float mix(float, float, float) 0:0(0): error: vec2 mix(vec2, vec2, vec2) 0:0(0): error: vec3 mix(vec3, vec3, vec3) 0:0(0): error: vec4 mix(vec4, vec4, vec4) 0:0(0): error: vec2 mix(vec2, vec2, float) 0:0(0): error: vec3 mix(vec3, vec3, float) 0:0(0): error: vec4 mix(vec4, vec4, float) Also add back disabling color management on older GL, as the srgb_compand() function is needed for that.
-rw-r--r--libvo/vo_opengl.c8
-rw-r--r--libvo/vo_opengl_shaders.glsl3
2 files changed, 11 insertions, 0 deletions
diff --git a/libvo/vo_opengl.c b/libvo/vo_opengl.c
index 0390955b5b..7b5289838f 100644
--- a/libvo/vo_opengl.c
+++ b/libvo/vo_opengl.c
@@ -1455,6 +1455,10 @@ static void check_gl_features(struct gl_priv *p)
bool have_fbo = gl->mpgl_caps & MPGL_CAP_FB;
bool have_srgb = gl->mpgl_caps & MPGL_CAP_SRGB_TEX;
+ // srgb_compand() not available
+ if (gl->glsl_version < 130)
+ have_srgb = false;
+
char *disabled[10];
int n_disabled = 0;
@@ -1488,6 +1492,10 @@ static void check_gl_features(struct gl_priv *p)
p->use_lut_3d = false;
disabled[n_disabled++] = "color management (FBO)";
}
+ if (!have_srgb && p->use_lut_3d) {
+ p->use_lut_3d = false;
+ disabled[n_disabled++] = "color management (sRGB)";
+ }
if (!have_fbo) {
p->use_scale_sep = false;
diff --git a/libvo/vo_opengl_shaders.glsl b/libvo/vo_opengl_shaders.glsl
index 5dd67bbd52..1f302889e4 100644
--- a/libvo/vo_opengl_shaders.glsl
+++ b/libvo/vo_opengl_shaders.glsl
@@ -37,11 +37,14 @@
# define in varying
#endif
+// Earlier GLSL doesn't support mix() with bvec
+#if __VERSION__ >= 130
vec3 srgb_compand(vec3 v)
{
return mix(1.055 * pow(v, vec3(1.0/2.4)) - vec3(0.055), v * 12.92,
lessThanEqual(v, vec3(0.0031308)));
}
+#endif
#!section vertex_all