Cleanup: GPU: Remove GPU_shaderinterface_uniform_ensure

7 files changed, 6 insertions, 32 deletions

diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h
index 0e382f2225f..baf3fb99974 100644
--- a/source/blender/gpu/GPU_shader.h
+++ b/source/blender/gpu/GPU_shader.h
@@ -92,7 +92,6 @@ void *GPU_shader_get_interface(GPUShader *shader);
 void GPU_shader_set_srgb_uniform(const struct GPUShaderInterface *interface);
 
 int GPU_shader_get_uniform(GPUShader *shader, const char *name);
-int GPU_shader_get_uniform_ensure(GPUShader *shader, const char *name);
 int GPU_shader_get_builtin_uniform(GPUShader *shader, int builtin);
 int GPU_shader_get_uniform_block(GPUShader *shader, const char *name);
 void GPU_shader_uniform_vector(
diff --git a/source/blender/gpu/GPU_shader_interface.h b/source/blender/gpu/GPU_shader_interface.h
index 91064719995..319a79a9e42 100644
--- a/source/blender/gpu/GPU_shader_interface.h
+++ b/source/blender/gpu/GPU_shader_interface.h
@@ -98,8 +98,6 @@ GPUShaderInterface *GPU_shaderinterface_create(int32_t program_id);
 void GPU_shaderinterface_discard(GPUShaderInterface *);
 
 const GPUShaderInput *GPU_shaderinterface_uniform(const GPUShaderInterface *, const char *name);
-const GPUShaderInput *GPU_shaderinterface_uniform_ensure(const GPUShaderInterface *,
-                                                         const char *name);
 const GPUShaderInput *GPU_shaderinterface_uniform_builtin(const GPUShaderInterface *,
                                                           GPUUniformBuiltin);
 const GPUShaderInput *GPU_shaderinterface_ubo(const GPUShaderInterface *, const char *name);
diff --git a/source/blender/gpu/intern/gpu_batch.c b/source/blender/gpu/intern/gpu_batch.c
index 3dd43431393..5f77f13c135 100644
--- a/source/blender/gpu/intern/gpu_batch.c
+++ b/source/blender/gpu/intern/gpu_batch.c
@@ -551,11 +551,11 @@ void GPU_batch_program_use_end(GPUBatch *batch)
 
 #if TRUST_NO_ONE
 #  define GET_UNIFORM \
-    const GPUShaderInput *uniform = GPU_shaderinterface_uniform_ensure(batch->interface, name); \
+    const GPUShaderInput *uniform = GPU_shaderinterface_uniform(batch->interface, name); \
     assert(uniform);
 #else
 #  define GET_UNIFORM \
-    const GPUShaderInput *uniform = GPU_shaderinterface_uniform_ensure(batch->interface, name);
+    const GPUShaderInput *uniform = GPU_shaderinterface_uniform(batch->interface, name);
 #endif
 
 void GPU_batch_uniform_1ui(GPUBatch *batch, const char *name, uint value)
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c
index 8a46e24d459..c1e7933d7ba 100644
--- a/source/blender/gpu/intern/gpu_codegen.c
+++ b/source/blender/gpu/intern/gpu_codegen.c
@@ -1160,7 +1160,7 @@ static int count_active_texture_sampler(GPUShader *shader, char *source)
       if (*code != '\0') {
         char sampler_name[64];
         code = gpu_str_skip_token(code, sampler_name, sizeof(sampler_name));
-        int id = GPU_shader_get_uniform_ensure(shader, sampler_name);
+        int id = GPU_shader_get_uniform(shader, sampler_name);
 
         if (id == -1) {
           continue;
diff --git a/source/blender/gpu/intern/gpu_immediate.c b/source/blender/gpu/intern/gpu_immediate.c
index d95904c0007..a26b315e7e5 100644
--- a/source/blender/gpu/intern/gpu_immediate.c
+++ b/source/blender/gpu/intern/gpu_immediate.c
@@ -759,13 +759,11 @@ void immVertex2iv(uint attr_id, const int data[2])
 #if 0
 #  if TRUST_NO_ONE
 #    define GET_UNIFORM \
-      const GPUShaderInput *uniform = GPU_shaderinterface_uniform_ensure(imm.shader_interface, \
-                                                                         name); \
+      const GPUShaderInput *uniform = GPU_shaderinterface_uniform(imm.shader_interface, name); \
       assert(uniform);
 #  else
 #    define GET_UNIFORM \
-      const GPUShaderInput *uniform = GPU_shaderinterface_uniform_ensure(imm.shader_interface, \
-                                                                         name);
+      const GPUShaderInput *uniform = GPU_shaderinterface_uniform(imm.shader_interface, name);
 #  endif
 #else
 /* NOTE: It is possible to have uniform fully optimized out from the shader.
@@ -773,8 +771,7 @@ void immVertex2iv(uint attr_id, const int data[2])
  * TODO(sergey): How can we detect existing-but-optimized-out uniform but still
  *               catch typos in uniform names passed to immUniform*() functions? */
 #  define GET_UNIFORM \
-    const GPUShaderInput *uniform = GPU_shaderinterface_uniform_ensure(imm.shader_interface, \
-                                                                       name); \
+    const GPUShaderInput *uniform = GPU_shaderinterface_uniform(imm.shader_interface, name); \
     if (uniform == NULL) \
       return;
 #endif
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c
index 8dfc992ae9f..d40b2307ea7 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -726,13 +726,6 @@ int GPU_shader_get_uniform(GPUShader *shader, const char *name)
 {
   BLI_assert(shader && shader->program);
   const GPUShaderInput *uniform = GPU_shaderinterface_uniform(shader->interface, name);
-  return uniform ? uniform->location : -2;
-}
-
-int GPU_shader_get_uniform_ensure(GPUShader *shader, const char *name)
-{
-  BLI_assert(shader && shader->program);
-  const GPUShaderInput *uniform = GPU_shaderinterface_uniform_ensure(shader->interface, name);
   return uniform ? uniform->location : -1;
 }
 
diff --git a/source/blender/gpu/intern/gpu_shader_interface.c b/source/blender/gpu/intern/gpu_shader_interface.c
index 5471333a4c8..2590d738917 100644
--- a/source/blender/gpu/intern/gpu_shader_interface.c
+++ b/source/blender/gpu/intern/gpu_shader_interface.c
@@ -454,19 +454,6 @@ const GPUShaderInput *GPU_shaderinterface_uniform(const GPUShaderInterface *shad
   return input_lookup(shaderface, shaderface->inputs + ofs, shaderface->uniform_len, name);
 }
 
-const GPUShaderInput *GPU_shaderinterface_uniform_ensure(const GPUShaderInterface *shaderface,
-                                                         const char *name)
-{
-  const GPUShaderInput *input = GPU_shaderinterface_uniform(shaderface, name);
-  /* If input is not found add it so it's found next time. */
-  if (input == NULL) {
-    if ((G.debug & G_DEBUG_GPU) && (input->location == -1)) {
-      fprintf(stderr, "GPUShaderInterface: Warning: Uniform '%s' not found!\n", name);
-    }
-  }
-  return input;
-}
-
 const GPUShaderInput *GPU_shaderinterface_uniform_builtin(const GPUShaderInterface *shaderface,
                                                           GPUUniformBuiltin builtin)
 {