diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2021-11-05 16:51:55 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-11-05 16:51:55 +0300 |
| commit | 00734d57248423b982e75f9d2398e4b7cdf1fe4a (patch) | |
| tree | 2991cc17365121ed3bed35ae64254f6fa5f7a3ca /source/blender/gpu/GPU_shader.h | |
| parent | 29e5c330cff8b7c68317b91502e29058b4f670fb (diff) | |
Fix T92807: Incorrect display planar tracking.
Issue introduced in {7e66616b7e15} where the shader was replaced with a
2d image shader. This patch reverts several commits that removed the 3d
image shader.
Diffstat (limited to 'source/blender/gpu/GPU_shader.h')
| -rw-r--r-- | source/blender/gpu/GPU_shader.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h index c6cfac79699..614af01b17b 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.h @@ -259,6 +259,15 @@ typedef enum eGPUBuiltinShader { GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE, GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE, GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR, + /** + * Draw texture with alpha. Take a 3D position and a 2D texture coordinate for each vertex. + * + * \param alpha: uniform float + * \param image: uniform sampler2D + * \param texCoord: in vec2 + * \param pos: in vec3 + */ + GPU_SHADER_3D_IMAGE_MODULATE_ALPHA, /* points */ /** * Draw round points with a hardcoded size. |