summaryrefslogtreecommitdiffstats
path: root/video/out/opengl/ra.h
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.xyz>2017-08-20 04:27:42 +0200
committerNiklas Haas <git@haasn.xyz>2017-09-04 13:53:23 +0200
commit5771f7abf48282fe847137845f17eec5a5af245f (patch)
treea26d750e8ba19edfe61e12986e2ffce3110a3f44 /video/out/opengl/ra.h
parent62f0677614ead1b094ac97b3ea1756541dcda03c (diff)
downloadmpv-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/ra.h')
-rw-r--r--video/out/opengl/ra.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/video/out/opengl/ra.h b/video/out/opengl/ra.h
index 0f1f98c6f0..81078da41f 100644
--- a/video/out/opengl/ra.h
+++ b/video/out/opengl/ra.h
@@ -10,6 +10,7 @@ struct ra {
int glsl_version; // GLSL version (e.g. 300 => 3.0)
bool glsl_es; // use ES dialect
+ bool glsl_vulkan; // use vulkan dialect
struct mp_log *log;
@@ -240,7 +241,8 @@ struct ra_renderpass_params {
// --- type==RA_RENDERPASS_TYPE_RASTER only
- // Describes the format of the vertex data.
+ // Describes the format of the vertex data. When using ra.glsl_vulkan,
+ // the order of this array must match the vertex attribute locations.
struct ra_renderpass_input *vertex_attribs;
int num_vertex_attribs;
int vertex_stride;