diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2022-01-17 16:34:28 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2022-01-17 16:34:28 +0300 |
| commit | edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7 (patch) | |
| tree | b8f15e66277700ccdc5d6c8b7c7eb3728f91182f /source/blender/gpu/shaders/gpu_shader_image_overlays_stereo_merge_frag.glsl | |
| parent | 8fb2ff458ba579dba08bfdf57d043ad158b5db07 (diff) | |
Revert "GPUShaderCreateInfo for interface abstraction"
This reverts commit 8fb2ff458ba579dba08bfdf57d043ad158b5db07.
Missing some files.
Diffstat (limited to 'source/blender/gpu/shaders/gpu_shader_image_overlays_stereo_merge_frag.glsl')
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_image_overlays_stereo_merge_frag.glsl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_image_overlays_stereo_merge_frag.glsl b/source/blender/gpu/shaders/gpu_shader_image_overlays_stereo_merge_frag.glsl index 9b1e6fe9d23..c6e9860d940 100644 --- a/source/blender/gpu/shaders/gpu_shader_image_overlays_stereo_merge_frag.glsl +++ b/source/blender/gpu/shaders/gpu_shader_image_overlays_stereo_merge_frag.glsl @@ -7,20 +7,18 @@ /* Composite stereo textures */ -#ifndef USE_GPU_SHADER_CREATE_INFO uniform sampler2D imageTexture; uniform sampler2D overlayTexture; uniform int stereoDisplaySettings; -layout(location = 0) out vec4 imageColor; -layout(location = 1) out vec4 overlayColor; -#endif - #define stereo_display_mode (stereoDisplaySettings & ((1 << 3) - 1)) #define stereo_interlace_mode ((stereoDisplaySettings >> 3) & ((1 << 3) - 1)) #define stereo_interlace_swap bool(stereoDisplaySettings >> 6) +layout(location = 0) out vec4 imageColor; +layout(location = 1) out vec4 overlayColor; + bool interlace(ivec2 texel) { int interlace_mode = stereo_interlace_mode; |