diff options
| author | James Ross-Gowan <rossy@jrg.systems> | 2017-10-02 23:10:52 +1100 |
|---|---|---|
| committer | James Ross-Gowan <rossy@jrg.systems> | 2017-11-07 20:27:13 +1100 |
| commit | 9b2dae79b1be1f57e7b6bcf80d500ab4190aa3d3 (patch) | |
| tree | 8c490aa1149b57d33f5eb1a03175425d212fe63f /video/out/gpu/video_shaders.c | |
| parent | 68eac1a1e7ac931576a8b59dd159a7961189ca48 (diff) | |
| download | mpv-9b2dae79b1be1f57e7b6bcf80d500ab4190aa3d3.tar.bz2 mpv-9b2dae79b1be1f57e7b6bcf80d500ab4190aa3d3.tar.xz | |
vo_gpu: d3d11: add RA caps for ra_d3d11
ra_d3d11 uses the SPIR-V compiler to translate GLSL to SPIR-V, which is
then translated to HLSL. This means it always exposes the same GLSL
version that the SPIR-V compiler supports (4.50 for shaderc/glslang.)
Despite claiming to support GLSL 4.50, some features that are tied to
the GLSL version in OpenGL are not supported by ra_d3d11 when targeting
legacy Direct3D feature levels.
This includes two features that mpv relies on:
- Reading from gl_FragCoord in the fragment shader (requires FL 10_0)
- textureGather from any texture component (requires FL 11_0)
These features have been exposed as new RA caps.
Diffstat (limited to 'video/out/gpu/video_shaders.c')
| -rw-r--r-- | video/out/gpu/video_shaders.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/video/out/gpu/video_shaders.c b/video/out/gpu/video_shaders.c index 02f27b1bdb..3e71c31369 100644 --- a/video/out/gpu/video_shaders.c +++ b/video/out/gpu/video_shaders.c @@ -143,7 +143,7 @@ static void polar_sample(struct gl_shader_cache *sc, struct scaler *scaler, } void pass_sample_polar(struct gl_shader_cache *sc, struct scaler *scaler, - int components, int glsl_version) + int components, bool sup_gather) { GLSL(color = vec4(0.0);) GLSLF("{\n"); @@ -167,8 +167,7 @@ void pass_sample_polar(struct gl_shader_cache *sc, struct scaler *scaler, // exactly when all four texels are within bounds bool use_gather = sqrt(x*x + y*y) < scaler->kernel->radius_cutoff; - // textureGather is only supported in GLSL 400+ - if (glsl_version < 400) + if (!sup_gather) use_gather = false; if (use_gather) { |