From 5771f7abf48282fe847137845f17eec5a5af245f Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Sun, 20 Aug 2017 04:27:42 +0200 Subject: 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) --- video/out/opengl/video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'video/out/opengl/video.c') 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;) } } -- cgit v1.2.3