From fd48ff1296f45b32bffeca2c60dca2a12bb84229 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Thu, 19 Mar 2020 08:06:49 +0100 Subject: Fix T73931: Stereo Viewport Color Management Stereoscopic viewport didn't support Color Manangement due recent changes in the color management pipeline. In order to solve the issue we will migrate the strereo rendering into the GPUViewport. This will share some textures and reduce required GPU memory. Reviewed By: fclem, dfelinto Differential Revision: https://developer.blender.org/D6922 --- source/blender/gpu/GPU_shader.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'source/blender/gpu/GPU_shader.h') diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h index d5716cd1b31..334e295c636 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.h @@ -184,6 +184,7 @@ typedef enum eGPUBuiltinShader { GPU_SHADER_3D_CLIPPED_UNIFORM_COLOR, /* basic image drawing */ GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE, + GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE, GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR, GPU_SHADER_2D_IMAGE_MASK_UNIFORM_COLOR, /** @@ -207,8 +208,6 @@ typedef enum eGPUBuiltinShader { */ GPU_SHADER_3D_IMAGE_DEPTH, GPU_SHADER_3D_IMAGE_DEPTH_COPY, - /* stereo 3d */ - GPU_SHADER_2D_IMAGE_INTERLACE, /* points */ /** * Draw round points with a hardcoded size. @@ -353,17 +352,6 @@ typedef struct GPUShaderConfigData { /* gpu_shader.c */ extern const GPUShaderConfigData GPU_shader_cfg_data[GPU_SHADER_CFG_LEN]; -/** - * Keep these in sync with: - * - `gpu_shader_image_interlace_frag.glsl` - * - `gpu_shader_image_rect_interlace_frag.glsl` - */ -typedef enum eGPUInterlaceShader { - GPU_SHADER_INTERLACE_ROW = 0, - GPU_SHADER_INTERLACE_COLUMN = 1, - GPU_SHADER_INTERLACE_CHECKER = 2, -} eGPUInterlaceShader; - GPUShader *GPU_shader_get_builtin_shader_with_config(eGPUBuiltinShader shader, eGPUShaderConfig sh_cfg); GPUShader *GPU_shader_get_builtin_shader(eGPUBuiltinShader shader); -- cgit v1.2.3