GPUShaderCreateInfo: Remove push_constant indexing

This is too much impractical and offers no real benefit.

2 files changed, 22 insertions, 22 deletions

diff --git a/source/blender/draw/intern/shaders/draw_hair_refine_info.hh b/source/blender/draw/intern/shaders/draw_hair_refine_info.hh
index 3c1af1bf759..b41be7d8605 100644
--- a/source/blender/draw/intern/shaders/draw_hair_refine_info.hh
+++ b/source/blender/draw/intern/shaders/draw_hair_refine_info.hh
@@ -29,14 +29,14 @@ GPU_SHADER_CREATE_INFO(draw_hair_refine_compute)
     .sampler(0, ImageType::FLOAT_BUFFER, "hairPointBuffer")
     .sampler(1, ImageType::UINT_BUFFER, "hairStrandBuffer")
     .sampler(2, ImageType::UINT_BUFFER, "hairStrandSegBuffer")
-    .push_constant(0, Type::VEC4, "hairDupliMatrix", 4)
-    .push_constant(16, Type::BOOL, "hairCloseTip")
-    .push_constant(17, Type::FLOAT, "hairRadShape")
-    .push_constant(18, Type::FLOAT, "hairRadTip")
-    .push_constant(19, Type::FLOAT, "hairRadRoot")
-    .push_constant(20, Type::INT, "hairThicknessRes")
-    .push_constant(21, Type::INT, "hairStrandsRes")
-    .push_constant(22, Type::INT, "hairStrandOffset")
+    .push_constant(Type::VEC4, "hairDupliMatrix", 4)
+    .push_constant(Type::BOOL, "hairCloseTip")
+    .push_constant(Type::FLOAT, "hairRadShape")
+    .push_constant(Type::FLOAT, "hairRadTip")
+    .push_constant(Type::FLOAT, "hairRadRoot")
+    .push_constant(Type::INT, "hairThicknessRes")
+    .push_constant(Type::INT, "hairStrandsRes")
+    .push_constant(Type::INT, "hairStrandOffset")
     .compute_source("common_hair_refine_comp.glsl")
     .define("HAIR_PHASE_SUBDIV")
     .do_static_compilation(true);
diff --git a/source/blender/draw/intern/shaders/draw_view_info.hh b/source/blender/draw/intern/shaders/draw_view_info.hh
index d40f51df543..0a25059ffed 100644
--- a/source/blender/draw/intern/shaders/draw_view_info.hh
+++ b/source/blender/draw/intern/shaders/draw_view_info.hh
@@ -26,7 +26,7 @@ GPU_SHADER_CREATE_INFO(draw_resource_id_varying)
 /* Variation used when drawing multiple instances for one object. */
 GPU_SHADER_CREATE_INFO(draw_resource_id_uniform)
     .define("UNIFORM_RESOURCE_ID")
-    .push_constant(64, Type::INT, "drw_ResourceID");
+    .push_constant(Type::INT, "drw_ResourceID");
 
 /**
  * Declare a resource handle that identify a unique object.
@@ -34,7 +34,7 @@ GPU_SHADER_CREATE_INFO(draw_resource_id_uniform)
  */
 GPU_SHADER_CREATE_INFO(draw_resource_handle)
     .define("resource_handle (drw_resourceChunk * DRW_RESOURCE_CHUNK_LEN + resource_id)")
-    .push_constant(63, Type::INT, "drw_resourceChunk");
+    .push_constant(Type::INT, "drw_resourceChunk");
 
 /** \} */
 
@@ -54,13 +54,13 @@ GPU_SHADER_CREATE_INFO(draw_modelmat)
 
 GPU_SHADER_CREATE_INFO(draw_modelmat_legacy)
     .define("DRW_LEGACY_MODEL_MATRIX")
-    .push_constant(38, Type::MAT4, "ModelMatrix")
-    .push_constant(54, Type::MAT4, "ModelMatrixInverse")
+    .push_constant(Type::MAT4, "ModelMatrix")
+    .push_constant(Type::MAT4, "ModelMatrixInverse")
     .additional_info("draw_view");
 
 GPU_SHADER_CREATE_INFO(draw_modelmat_instanced_attr)
-    .push_constant(0, Type::MAT4, "ModelMatrix")
-    .push_constant(16, Type::MAT4, "ModelMatrixInverse")
+    .push_constant(Type::MAT4, "ModelMatrix")
+    .push_constant(Type::MAT4, "ModelMatrixInverse")
     .additional_info("draw_view");
 
 /** \} */
@@ -84,14 +84,14 @@ GPU_SHADER_CREATE_INFO(draw_hair)
     .sampler(14, ImageType::UINT_BUFFER, "hairStrandBuffer")
     .sampler(13, ImageType::UINT_BUFFER, "hairStrandSegBuffer")
     /* TODO(fclem) Pack thoses into one UBO. */
-    .push_constant(9, Type::INT, "hairStrandsRes")
-    .push_constant(10, Type::INT, "hairThicknessRes")
-    .push_constant(11, Type::FLOAT, "hairRadRoot")
-    .push_constant(12, Type::FLOAT, "hairRadTip")
-    .push_constant(13, Type::FLOAT, "hairRadShape")
-    .push_constant(14, Type::BOOL, "hairCloseTip")
-    .push_constant(15, Type::INT, "hairStrandOffset")
-    .push_constant(16, Type::VEC4, "hairDupliMatrix", 4)
+    .push_constant(Type::INT, "hairStrandsRes")
+    .push_constant(Type::INT, "hairThicknessRes")
+    .push_constant(Type::FLOAT, "hairRadRoot")
+    .push_constant(Type::FLOAT, "hairRadTip")
+    .push_constant(Type::FLOAT, "hairRadShape")
+    .push_constant(Type::BOOL, "hairCloseTip")
+    .push_constant(Type::INT, "hairStrandOffset")
+    .push_constant(Type::VEC4, "hairDupliMatrix", 4)
     .additional_info("draw_modelmat", "draw_resource_id");
 
 GPU_SHADER_CREATE_INFO(draw_pointcloud)