diff options
| author | Niklas Haas <git@nand.wakku.to> | 2015-01-20 21:46:19 +0100 |
|---|---|---|
| committer | Niklas Haas <git@nand.wakku.to> | 2015-01-22 19:40:04 +0100 |
| commit | 8eb9ddd868add4f7d5ac3adb39a526a4812ac8e7 (patch) | |
| tree | 5ef67eb5b8bf26d7fb27b7d737d88a7a48bca828 /video/out/gl_video_shaders.glsl | |
| parent | 02df9886ea239a8efa578677d44ee9b5f74be422 (diff) | |
| download | mpv-8eb9ddd868add4f7d5ac3adb39a526a4812ac8e7.tar.bz2 mpv-8eb9ddd868add4f7d5ac3adb39a526a4812ac8e7.tar.xz | |
vo_opengl: rename all scale options to make more sense
This emphasizes the fact that scale is used for *all* image upscaling,
with cscale only serving a minor role for subsampled material.
Diffstat (limited to 'video/out/gl_video_shaders.glsl')
| -rw-r--r-- | video/out/gl_video_shaders.glsl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/video/out/gl_video_shaders.glsl b/video/out/gl_video_shaders.glsl index 84c87173c3..e40a94e185 100644 --- a/video/out/gl_video_shaders.glsl +++ b/video/out/gl_video_shaders.glsl @@ -375,22 +375,22 @@ void main() { #define USE_CONV 0 #endif #if USE_CONV == CONV_PLANAR - vec4 acolor = vec4(SAMPLE_L(texture0, textures_size[0], texcoord).r, + vec4 acolor = vec4(SAMPLE(texture0, textures_size[0], texcoord).r, SAMPLE_C(texture1, textures_size[1], chr_texcoord).r, SAMPLE_C(texture2, textures_size[2], chr_texcoord).r, 1.0); #elif USE_CONV == CONV_NV12 - vec4 acolor = vec4(SAMPLE_L(texture0, textures_size[0], texcoord).r, + vec4 acolor = vec4(SAMPLE(texture0, textures_size[0], texcoord).r, SAMPLE_C(texture1, textures_size[1], chr_texcoord).RG, 1.0); #else - vec4 acolor = SAMPLE_L(texture0, textures_size[0], texcoord); + vec4 acolor = SAMPLE(texture0, textures_size[0], texcoord); #endif #ifdef USE_COLOR_SWIZZLE acolor = acolor. USE_COLOR_SWIZZLE ; #endif #ifdef USE_ALPHA_PLANE - acolor.a = SAMPLE_L(texture3, textures_size[3], texcoord).r; + acolor.a = SAMPLE(texture3, textures_size[3], texcoord).r; #endif vec3 color = acolor.rgb; float alpha = acolor.a; |