diff options
author | wm4 <wm4@nowhere> | 2014-12-18 22:24:45 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-12-18 22:24:45 +0100 |
commit | 1b766ab208d23d272b2f57b4ea02c892dc1dd029 (patch) | |
tree | d6563d2fe8c9ad1532152e334b9db508b608d468 /video/out/gl_common.c | |
parent | 32fb3dae8783800e01e94b561baca306389d64a8 (diff) | |
download | mpv-1b766ab208d23d272b2f57b4ea02c892dc1dd029.tar.bz2 mpv-1b766ab208d23d272b2f57b4ea02c892dc1dd029.tar.xz |
vo_opengl: do not use 4x3 matrix
This was a nice trick to get the mpv colormatrix directly into OpenGL,
because the memory representation happened to match.
Unfortunately, OpenGL ES 2 doesn't have glUniformMatrix4x3fv().
Even more unfortunately, the memory representation is now incompatible.
It would be nice to change it, but that would mean getting into a big
mess.
Diffstat (limited to 'video/out/gl_common.c')
-rw-r--r-- | video/out/gl_common.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/video/out/gl_common.c b/video/out/gl_common.c index 50864afaf7..bbfbcdcda4 100644 --- a/video/out/gl_common.c +++ b/video/out/gl_common.c @@ -202,9 +202,11 @@ static const struct gl_functions gl_functions[] = { {0} }, }, - // GL 2.0-3.x functions + // GL 2.1-3.x functions (also: GLSL 120 shaders) + // All of the listed functions are also in GL 2.0 { - .ver_core = MPGL_VER(2, 0), + .ver_core = MPGL_VER(2, 1), + .provides = MPGL_CAP_GL21, .functions = (const struct gl_function[]) { DEF_FN(GenBuffers), DEF_FN(DeleteBuffers), @@ -245,15 +247,6 @@ static const struct gl_functions gl_functions[] = { {0}, }, }, - // GL 2.1-3.x functions (also: GLSL 120 shaders) - { - .ver_core = MPGL_VER(2, 1), - .provides = MPGL_CAP_GL21, - .functions = (const struct gl_function[]) { - DEF_FN(UniformMatrix4x3fv), - {0} - }, - }, // GL 3.x core only functions. { .ver_core = MPGL_VER(3, 0), |