summaryrefslogtreecommitdiffstats
path: root/video/out/opengl
diff options
context:
space:
mode:
authorJames Ross-Gowan <rossy@jrg.systems>2017-10-22 01:18:31 +1100
committerJames Ross-Gowan <rossy@jrg.systems>2017-11-07 20:27:13 +1100
commit8020a62953926cd6d672e9151290bd4d65e8ee08 (patch)
tree2271615c7f6c3e7370e0e7399338abfc33c3a744 /video/out/opengl
parent41dff03f8d856273e4a87293f87887d9940009fa (diff)
downloadmpv-8020a62953926cd6d672e9151290bd4d65e8ee08.tar.bz2
mpv-8020a62953926cd6d672e9151290bd4d65e8ee08.tar.xz
vo_gpu: export the GLSL format qualifier for ra_format
Backported from @haasn's change to libplacebo, except in the current RA, there's nothing to indicate an ra_format can be bound as a storage image, so there's no way to force all of these formats to have a glsl_format. Instead, the layout qualifier will be removed if glsl_format is NULL. This is needed for the upcoming ra_d3d11 backend. In Direct3D 11, while loading float values from unorm images often works as expected, it's technically undefined behaviour, and in Windows 10, it will cause the debug layer to spam the log with error messages. Also, apparently in GLSL, the format name must match the image's format exactly (but in Direct3D, it just has to have the same component type.)
Diffstat (limited to 'video/out/opengl')
-rw-r--r--video/out/opengl/ra_gl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/video/out/opengl/ra_gl.c b/video/out/opengl/ra_gl.c
index 86488b11ab..61ac2c2bbb 100644
--- a/video/out/opengl/ra_gl.c
+++ b/video/out/opengl/ra_gl.c
@@ -179,6 +179,8 @@ static int ra_init_gl(struct ra *ra, GL *gl)
desc->chroma_w = desc->chroma_h = 1;
}
+ fmt->glsl_format = ra_fmt_glsl_format(fmt);
+
MP_TARRAY_APPEND(ra, ra->formats, ra->num_formats, fmt);
}