diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2022-01-27 10:48:37 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2022-01-27 10:54:24 +0300 |
commit | 5abab0a41a02a0dbae0ea3ec355b7dfb6a778613 (patch) | |
tree | c18ed3a2395967c3aad146e316b26694ed746e4f /source/blender/gpu/shaders | |
parent | a7f7b0b77e3ffce679c1b3a79bd7b9fd92779959 (diff) |
GPUShaderCreateInfo: Remove push_constant indexing
This is too much impractical and offers no real benefit.
Diffstat (limited to 'source/blender/gpu/shaders')
30 files changed, 67 insertions, 67 deletions
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh index bf746eae9b4..b5dce51fc1b 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh @@ -29,11 +29,11 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_area_borders) .vertex_in(0, Type::VEC2, "pos") .vertex_out(smooth_uv_iface) .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") - .push_constant(16, Type::VEC4, "rect") - .push_constant(20, Type::VEC4, "color") - .push_constant(24, Type::FLOAT, "scale") - .push_constant(25, Type::INT, "cornerLen") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::VEC4, "rect") + .push_constant(Type::VEC4, "color") + .push_constant(Type::FLOAT, "scale") + .push_constant(Type::INT, "cornerLen") .vertex_source("gpu_shader_2D_area_borders_vert.glsl") .fragment_source("gpu_shader_2D_area_borders_frag.glsl") .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_checker_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_checker_info.hh index 48c261da8dd..b8dbca276ae 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_checker_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_checker_info.hh @@ -26,10 +26,10 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_checker) .vertex_in(0, Type::VEC2, "pos") .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") - .push_constant(16, Type::VEC4, "color1") - .push_constant(20, Type::VEC4, "color2") - .push_constant(24, Type::INT, "size") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::VEC4, "color1") + .push_constant(Type::VEC4, "color2") + .push_constant(Type::INT, "size") .vertex_source("gpu_shader_2D_vert.glsl") .fragment_source("gpu_shader_checker_frag.glsl") .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_diag_stripes_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_diag_stripes_info.hh index 51ce7f503df..b52be8b328e 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_diag_stripes_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_diag_stripes_info.hh @@ -26,11 +26,11 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_diag_stripes) .vertex_in(0, Type::VEC2, "pos") .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") - .push_constant(16, Type::VEC4, "color1") - .push_constant(20, Type::VEC4, "color2") - .push_constant(24, Type::INT, "size1") - .push_constant(28, Type::INT, "size2") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::VEC4, "color1") + .push_constant(Type::VEC4, "color2") + .push_constant(Type::INT, "size1") + .push_constant(Type::INT, "size2") .vertex_source("gpu_shader_2D_vert.glsl") .fragment_source("gpu_shader_diag_stripes_frag.glsl") .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_flat_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_flat_color_info.hh index bbc5446f16f..699b0a456f9 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_flat_color_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_flat_color_info.hh @@ -30,7 +30,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_flat_color) .vertex_in(1, Type::VEC4, "color") .vertex_out(flat_color_iface) .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .vertex_source("gpu_shader_2D_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_2D_image_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_color_info.hh index a6cc9076d4a..8ac9f58d936 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_color_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_color_info.hh @@ -25,6 +25,6 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_color) .additional_info("gpu_shader_2D_image_common") - .push_constant(16, Type::VEC4, "color") + .push_constant(Type::VEC4, "color") .fragment_source("gpu_shader_image_color_frag.glsl") .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_color_info.hh index e11d6746446..3e10c0e1651 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_color_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_color_info.hh @@ -25,7 +25,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_desaturate_color) .additional_info("gpu_shader_2D_image_common") - .push_constant(16, Type::VEC4, "color") - .push_constant(20, Type::FLOAT, "factor") + .push_constant(Type::VEC4, "color") + .push_constant(Type::FLOAT, "factor") .fragment_source("gpu_shader_image_desaturate_frag.glsl") .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_info.hh index 3d20b63c265..989e38527c0 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_info.hh @@ -29,7 +29,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_common) .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") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .sampler(0, ImageType::FLOAT_2D, "image") .vertex_source("gpu_shader_2D_image_vert.glsl"); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_merge_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_merge_info.hh index c2c0e9fec78..d1a2a8f6ee7 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_merge_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_merge_info.hh @@ -29,9 +29,9 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_overlays_merge) .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") - .push_constant(16, Type::BOOL, "display_transform") - .push_constant(17, Type::BOOL, "overlay") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::BOOL, "display_transform") + .push_constant(Type::BOOL, "overlay") .sampler(0, ImageType::FLOAT_2D, "image_texture") .sampler(1, ImageType::FLOAT_2D, "overlays_texture") .vertex_source("gpu_shader_2D_image_vert.glsl") diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_stereo_merge_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_stereo_merge_info.hh index c1e6c3957d3..d099d95e4b6 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_stereo_merge_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_stereo_merge_info.hh @@ -29,8 +29,8 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_overlays_stereo_merge) .fragment_out(1, Type::VEC4, "overlayColor") .sampler(0, ImageType::FLOAT_2D, "imageTexture") .sampler(1, ImageType::FLOAT_2D, "overlayTexture") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") - .push_constant(16, Type::INT, "stereoDisplaySettings") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::INT, "stereoDisplaySettings") .vertex_source("gpu_shader_2D_vert.glsl") .fragment_source("gpu_shader_image_overlays_stereo_merge_frag.glsl") .do_static_compilation(true); 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 4e10b91ef39..9d5fb152561 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 @@ -27,10 +27,10 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_rect_color) .vertex_out(smooth_tex_coord_interp_iface) .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") - .push_constant(16, Type::VEC4, "color") - .push_constant(20, Type::VEC4, "rect_icon") - .push_constant(24, Type::VEC4, "rect_geom") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::VEC4, "color") + .push_constant(Type::VEC4, "rect_icon") + .push_constant(Type::VEC4, "rect_geom") .sampler(0, ImageType::FLOAT_2D, "image") .vertex_source("gpu_shader_2D_image_rect_vert.glsl") .fragment_source("gpu_shader_image_color_frag.glsl") diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_shuffle_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_shuffle_color_info.hh index 3663de0a98f..93950b37509 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_shuffle_color_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_shuffle_color_info.hh @@ -25,7 +25,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_shuffle_color) .additional_info("gpu_shader_2D_image_common") - .push_constant(16, Type::VEC4, "color") - .push_constant(20, Type::VEC4, "shuffle") + .push_constant(Type::VEC4, "color") + .push_constant(Type::VEC4, "shuffle") .fragment_source("gpu_shader_image_shuffle_color_frag.glsl") .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_line_dashed_uniform_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_line_dashed_uniform_color_info.hh index 371a35386a7..afac24e6241 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_line_dashed_uniform_color_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_line_dashed_uniform_color_info.hh @@ -28,7 +28,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_line_dashed_uniform_color) .vertex_in(0, Type::VEC3, "pos") .vertex_out(flat_color_iface) - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .vertex_source("gpu_shader_2D_line_dashed_uniform_color_vert.glsl") .fragment_source("gpu_shader_2D_line_dashed_frag.glsl") .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_nodelink_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_nodelink_info.hh index b15d7ba3ada..15451899d5d 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_nodelink_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_nodelink_info.hh @@ -39,7 +39,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_nodelink) .vertex_out(nodelink_iface) .fragment_out(0, Type::VEC4, "fragColor") .uniform_buf(0, "NodeLinkData", "node_link_data", Frequency::PASS) - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .vertex_source("gpu_shader_2D_nodelink_vert.glsl") .fragment_source("gpu_shader_2D_nodelink_frag.glsl") .typedef_source("GPU_shader_shared.h") @@ -64,7 +64,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_nodelink_inst) .vertex_out(nodelink_iface) .fragment_out(0, Type::VEC4, "fragColor") .uniform_buf(0, "NodeLinkInstanceData", "node_link_data", Frequency::PASS) - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .vertex_source("gpu_shader_2D_nodelink_vert.glsl") .fragment_source("gpu_shader_2D_nodelink_frag.glsl") .typedef_source("GPU_shader_shared.h") diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh index d2753af8e9b..2a3d5698ba4 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh @@ -28,9 +28,9 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_aa) .vertex_in(0, Type::VEC2, "pos") .vertex_out(smooth_radii_iface) .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") - .push_constant(16, Type::VEC4, "color") - .push_constant(20, Type::FLOAT, "size") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::VEC4, "color") + .push_constant(Type::FLOAT, "size") .vertex_source("gpu_shader_2D_point_uniform_size_aa_vert.glsl") .fragment_source("gpu_shader_point_uniform_color_aa_frag.glsl") .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh index edc83534573..c7cc61e745b 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh @@ -28,11 +28,11 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_outline_aa .vertex_in(0, Type::VEC2, "pos") .vertex_out(smooth_radii_outline_iface) .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") - .push_constant(20, Type::VEC4, "color") - .push_constant(24, Type::VEC4, "outlineColor") - .push_constant(28, Type::FLOAT, "size") - .push_constant(29, Type::FLOAT, "outlineWidth") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::VEC4, "color") + .push_constant(Type::VEC4, "outlineColor") + .push_constant(Type::FLOAT, "size") + .push_constant(Type::FLOAT, "outlineWidth") .vertex_source("gpu_shader_2D_point_uniform_size_outline_aa_vert.glsl") .fragment_source("gpu_shader_point_uniform_color_outline_aa_frag.glsl") .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_point_varying_size_varying_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_point_varying_size_varying_color_info.hh index 4358e94f91f..38dddb4357e 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_point_varying_size_varying_color_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_point_varying_size_varying_color_info.hh @@ -30,7 +30,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_varying_size_varying_color) .vertex_in(2, Type::VEC4, "color") .vertex_out(smooth_color_iface) .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .vertex_source("gpu_shader_2D_point_varying_size_varying_color_vert.glsl") .fragment_source("gpu_shader_point_varying_color_frag.glsl") .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_smooth_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_smooth_color_info.hh index 0029e8d2044..128be12a7d9 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_smooth_color_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_smooth_color_info.hh @@ -29,7 +29,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_smooth_color) .vertex_in(1, Type::VEC4, "color") .vertex_out(smooth_color_iface) .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .vertex_source("gpu_shader_2D_smooth_color_vert.glsl") .fragment_source("gpu_shader_2D_smooth_color_frag.glsl") .additional_info("gpu_srgb_to_framebuffer_space") diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_uniform_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_uniform_color_info.hh index 7e75b265711..3dab6d36753 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_2D_uniform_color_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_uniform_color_info.hh @@ -26,8 +26,8 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_uniform_color) .vertex_in(0, Type::VEC2, "pos") .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") - .push_constant(16, Type::VEC4, "color") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::VEC4, "color") .vertex_source("gpu_shader_2D_vert.glsl") .fragment_source("gpu_shader_uniform_color_frag.glsl") .additional_info("gpu_srgb_to_framebuffer_space") diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh index 3e7e4aeecda..63a4e679215 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh @@ -27,7 +27,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_depth_only) .vertex_in(0, Type::VEC3, "pos") .vertex_out(flat_color_iface) - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .vertex_source("gpu_shader_3D_vert.glsl") .fragment_source("gpu_shader_depth_only_frag.glsl") .do_static_compilation(true); 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 14a6986f478..4628f8bd6c4 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 @@ -29,7 +29,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_flat_color) .vertex_in(1, Type::VEC4, "color") .vertex_out(flat_color_iface) .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .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_image_modulate_alpha_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_image_modulate_alpha_info.hh index b829975448c..d47df129501 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_3D_image_modulate_alpha_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_image_modulate_alpha_info.hh @@ -29,8 +29,8 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_image_modulate_alpha) .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") - .push_constant(16, Type::FLOAT, "alpha") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::FLOAT, "alpha") .sampler(0, ImageType::FLOAT_2D, "image", Frequency::PASS) .vertex_source("gpu_shader_3D_image_vert.glsl") .fragment_source("gpu_shader_image_modulate_alpha_frag.glsl") diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_line_dashed_uniform_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_line_dashed_uniform_color_info.hh index d43ea799420..62c05d4677c 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_3D_line_dashed_uniform_color_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_line_dashed_uniform_color_info.hh @@ -28,7 +28,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_line_dashed_uniform_color) .vertex_in(0, Type::VEC3, "pos") .vertex_out(flat_color_iface) - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .vertex_source("gpu_shader_3D_line_dashed_uniform_color_vert.glsl") .fragment_source("gpu_shader_2D_line_dashed_frag.glsl") .do_static_compilation(true); 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 27357eef8c9..d7b6806acc6 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 @@ -28,7 +28,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_point_fixed_size_varying_color) .vertex_in(1, Type::VEC4, "color") .vertex_out(smooth_color_iface) .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .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); @@ -39,7 +39,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_point_varying_size_varying_color) .vertex_in(2, Type::FLOAT, "size") .vertex_out(smooth_color_iface) .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .vertex_source("gpu_shader_3D_point_varying_size_varying_color_vert.glsl") .fragment_source("gpu_shader_point_varying_color_frag.glsl") .do_static_compilation(true); @@ -48,9 +48,9 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_point_uniform_size_uniform_color_aa) .vertex_in(0, Type::VEC3, "pos") .vertex_out(smooth_radii_iface) .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") - .push_constant(16, Type::VEC4, "color") - .push_constant(20, Type::FLOAT, "size") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::VEC4, "color") + .push_constant(Type::FLOAT, "size") .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); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh index c99d9ed199d..10f6e9a5b83 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh @@ -29,7 +29,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_smooth_color) .vertex_in(1, Type::VEC4, "color") .vertex_out(smooth_color_iface) .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .vertex_source("gpu_shader_3D_smooth_color_vert.glsl") .fragment_source("gpu_shader_3D_smooth_color_frag.glsl") .additional_info("gpu_srgb_to_framebuffer_space") diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_info.hh index 5b8517310ea..e96ce8842f1 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_uniform_color_info.hh @@ -26,8 +26,8 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_uniform_color) .vertex_in(0, Type::VEC3, "pos") .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") - .push_constant(16, Type::VEC4, "color") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::VEC4, "color") .vertex_source("gpu_shader_3D_vert.glsl") .fragment_source("gpu_shader_uniform_color_frag.glsl") .additional_info("gpu_srgb_to_framebuffer_space") diff --git a/source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh index c337c399f59..460ef3f5acf 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_gpencil_stroke_info.hh @@ -41,8 +41,8 @@ GPU_SHADER_CREATE_INFO(gpu_shader_gpencil_stroke) .uniform_buf(0, "GPencilStrokeData", "gpencil_stroke_data") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") - .push_constant(16, Type::MAT4, "ProjectionMatrix") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::MAT4, "ProjectionMatrix") .vertex_source("gpu_shader_gpencil_stroke_vert.glsl") .geometry_source("gpu_shader_gpencil_stroke_geom.glsl") .fragment_source("gpu_shader_gpencil_stroke_frag.glsl") diff --git a/source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh index 98a1fcf5b37..418ec0bef2d 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh @@ -31,7 +31,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_instance_varying_color_varying_size) .vertex_in(3, Type::FLOAT, "size") .vertex_out(flat_color_iface) .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ViewProjectionMatrix") + .push_constant(Type::MAT4, "ViewProjectionMatrix") .vertex_source("gpu_shader_instance_variying_size_variying_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_keyframe_shape_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_info.hh index f8cb94e52d0..bbd3b6a9f01 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_keyframe_shape_info.hh @@ -38,9 +38,9 @@ GPU_SHADER_CREATE_INFO(gpu_shader_keyframe_shape) .vertex_in(4, Type ::INT, "flags") .vertex_out(keyframe_shape_iface) .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") - .push_constant(16, Type::VEC2, "ViewportSize") - .push_constant(24, Type::FLOAT, "outline_scale") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::VEC2, "ViewportSize") + .push_constant(Type::FLOAT, "outline_scale") .vertex_source("gpu_shader_keyframe_shape_vert.glsl") .fragment_source("gpu_shader_keyframe_shape_frag.glsl") .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_simple_lighting_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_simple_lighting_info.hh index c3f86ed2b6f..8afa7d79f3f 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_simple_lighting_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_simple_lighting_info.hh @@ -32,8 +32,8 @@ GPU_SHADER_CREATE_INFO(gpu_shader_simple_lighting) .vertex_out(smooth_normal_iface) .fragment_out(0, Type::VEC4, "fragColor") .uniform_buf(0, "SimpleLightingData", "simple_lighting_data", Frequency::PASS) - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") - .push_constant(16, Type::MAT3, "NormalMatrix") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::MAT3, "NormalMatrix") .typedef_source("GPU_shader_shared.h") .vertex_source("gpu_shader_3D_normal_vert.glsl") .fragment_source("gpu_shader_simple_lighting_frag.glsl") diff --git a/source/blender/gpu/shaders/infos/gpu_shader_text_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_text_info.hh index 2c17a494d76..9429db66f90 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_text_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_text_info.hh @@ -37,7 +37,7 @@ GPU_SHADER_CREATE_INFO(gpu_shader_text) .vertex_in(3, Type ::INT, "offset") .vertex_out(text_iface) .fragment_out(0, Type::VEC4, "fragColor") - .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix") + .push_constant(Type::MAT4, "ModelViewProjectionMatrix") .sampler(0, ImageType::FLOAT_2D, "glyph", Frequency::PASS) .vertex_source("gpu_shader_text_vert.glsl") .fragment_source("gpu_shader_text_frag.glsl") |