Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2022-01-21 11:58:58 +0300
committerJeroen Bakker <jeroen@blender.org>2022-01-21 11:58:58 +0300
commit23fa5bb723049684b06192afbdd1714e4109be72 (patch)
tree33cf86682b1cc5a15199c2aa82b2742a76cd144b /source
parent64196a6b29016892f52771947047146c6c125f3f (diff)
GPU: Remove unused resources in shader create info.
When adding the shader create infos some additional resources where defined that doesn't exist in the shader itself. This commit will remove them.
Diffstat (limited to 'source')
-rw-r--r--source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh2
-rw-r--r--source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh1
-rw-r--r--source/blender/gpu/shaders/infos/gpu_shader_3D_point_info.hh2
3 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh
index b94556bbb25..4e10b91ef39 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_rect_color_info.hh
@@ -25,8 +25,6 @@
#include "gpu_shader_create_info.hh"
GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_rect_color)
- .vertex_in(0, Type::VEC2, "pos")
- .vertex_in(1, Type::VEC2, "texCoord")
.vertex_out(smooth_tex_coord_interp_iface)
.fragment_out(0, Type::VEC4, "fragColor")
.push_constant(0, Type::MAT4, "ModelViewProjectionMatrix")
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh
index 70b2dac8266..14a6986f478 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh
@@ -30,7 +30,6 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_flat_color)
.vertex_out(flat_color_iface)
.fragment_out(0, Type::VEC4, "fragColor")
.push_constant(0, Type::MAT4, "ModelViewProjectionMatrix")
- .push_constant(1, Type::BOOL, "srgbTarget")
.vertex_source("gpu_shader_3D_flat_color_vert.glsl")
.fragment_source("gpu_shader_flat_color_frag.glsl")
.additional_info("gpu_srgb_to_framebuffer_space")
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_point_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_point_info.hh
index b62c8fe7518..27357eef8c9 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_3D_point_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_point_info.hh
@@ -29,7 +29,6 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_point_fixed_size_varying_color)
.vertex_out(smooth_color_iface)
.fragment_out(0, Type::VEC4, "fragColor")
.push_constant(0, Type::MAT4, "ModelViewProjectionMatrix")
- .push_constant(16, Type::FLOAT, "size")
.vertex_source("gpu_shader_3D_point_fixed_size_varying_color_vert.glsl")
.fragment_source("gpu_shader_point_varying_color_frag.glsl")
.do_static_compilation(true);
@@ -52,7 +51,6 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_point_uniform_size_uniform_color_aa)
.push_constant(0, Type::MAT4, "ModelViewProjectionMatrix")
.push_constant(16, Type::VEC4, "color")
.push_constant(20, Type::FLOAT, "size")
- .push_constant(24, Type::FLOAT, "outlineWidth")
.vertex_source("gpu_shader_3D_point_uniform_size_aa_vert.glsl")
.fragment_source("gpu_shader_point_uniform_color_aa_frag.glsl")
.do_static_compilation(true);