diff options
| author | Niklas Haas <git@haasn.xyz> | 2017-08-20 04:27:42 +0200 |
|---|---|---|
| committer | Niklas Haas <git@haasn.xyz> | 2017-09-04 13:53:23 +0200 |
| commit | 5771f7abf48282fe847137845f17eec5a5af245f (patch) | |
| tree | a26d750e8ba19edfe61e12986e2ffce3110a3f44 /video/out/opengl/video.c | |
| parent | 62f0677614ead1b094ac97b3ea1756541dcda03c (diff) | |
| download | mpv-5771f7abf48282fe847137845f17eec5a5af245f.tar.bz2 mpv-5771f7abf48282fe847137845f17eec5a5af245f.tar.xz | |
vo_opengl: add support for vulkan GLSL dialect
Redefining texture1D / texture3D seems to be illegal, they are already
built-in macros or something. So just use tex1D and tex3D instead.
Additionally, GL_KHR_vulkan_glsl requires using explicit vertex
locations and bindings, so make some changes to facilitate this. (It
also requires explicitly setting location=0 for the color attachment
output)
Diffstat (limited to 'video/out/opengl/video.c')
| -rw-r--r-- | video/out/opengl/video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c index 1378872838..8d90c2bcaa 100644 --- a/video/out/opengl/video.c +++ b/video/out/opengl/video.c @@ -2467,7 +2467,7 @@ static void pass_colormanage(struct gl_video *p, struct mp_colorspace src, bool GLSL(vec3 cpos;) for (int i = 0; i < 3; i++) GLSLF("cpos[%d] = LUT_POS(color[%d], %d.0);\n", i, i, p->lut_3d_size[i]); - GLSL(color.rgb = texture3D(lut_3d, cpos).rgb;) + GLSL(color.rgb = tex3D(lut_3d, cpos).rgb;) } } |