Cleanup: use shorter name for shader config

The struct name is descriptive,
this isn't going to be confused with other variables.

4 files changed, 9 insertions, 9 deletions

diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h
index f10202f5642..459a997b4f4 100644
--- a/source/blender/gpu/GPU_batch.h
+++ b/source/blender/gpu/GPU_batch.h
@@ -125,7 +125,7 @@ void GPU_batch_program_set_shader(GPUBatch *, GPUShader *shader);
 void GPU_batch_program_set_builtin(
         GPUBatch *batch, eGPUBuiltinShader shader_id);
 void GPU_batch_program_set_builtin_with_config(
-        GPUBatch *batch, eGPUBuiltinShader shader_id, eGPUShaderConfig shader_cfg);
+        GPUBatch *batch, eGPUBuiltinShader shader_id, eGPUShaderConfig sh_cfg);
 /* Entire batch draws with one shader program, but can be redrawn later with another program. */
 /* Vertex shader's inputs must be compatible with the batch's vertex format. */
 
diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h
index 38d9b4097a0..bae8c3c7b53 100644
--- a/source/blender/gpu/GPU_shader.h
+++ b/source/blender/gpu/GPU_shader.h
@@ -376,7 +376,7 @@ typedef enum eGPUInterlaceShader {
 } eGPUInterlaceShader;
 
 GPUShader *GPU_shader_get_builtin_shader_with_config(
-        eGPUBuiltinShader shader, eGPUShaderConfig shader_cfg);
+        eGPUBuiltinShader shader, eGPUShaderConfig sh_cfg);
 GPUShader *GPU_shader_get_builtin_shader(
         eGPUBuiltinShader shader);
 
diff --git a/source/blender/gpu/intern/gpu_batch.c b/source/blender/gpu/intern/gpu_batch.c
index bd4fa25c306..9738b303700 100644
--- a/source/blender/gpu/intern/gpu_batch.c
+++ b/source/blender/gpu/intern/gpu_batch.c
@@ -669,9 +669,9 @@ void GPU_batch_program_set_shader(GPUBatch *batch, GPUShader *shader)
 }
 
 void GPU_batch_program_set_builtin_with_config(
-        GPUBatch *batch, eGPUBuiltinShader shader_id, eGPUShaderConfig shader_cfg)
+        GPUBatch *batch, eGPUBuiltinShader shader_id, eGPUShaderConfig sh_cfg)
 {
-	GPUShader *shader = GPU_shader_get_builtin_shader_with_config(shader_id, shader_cfg);
+	GPUShader *shader = GPU_shader_get_builtin_shader_with_config(shader_id, sh_cfg);
 	GPU_batch_program_set(batch, shader->program, shader->interface);
 }
 
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c
index 8bc53a71b5a..4245adbde5f 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -1170,11 +1170,11 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
 };
 
 GPUShader *GPU_shader_get_builtin_shader_with_config(
-        eGPUBuiltinShader shader, eGPUShaderConfig shader_cfg)
+        eGPUBuiltinShader shader, eGPUShaderConfig sh_cfg)
 {
 	BLI_assert(shader < GPU_SHADER_BUILTIN_LEN);
-	BLI_assert(shader_cfg < GPU_SHADER_CFG_LEN);
-	GPUShader **sh_p = &builtin_shaders[shader_cfg][shader];
+	BLI_assert(sh_cfg < GPU_SHADER_CFG_LEN);
+	GPUShader **sh_p = &builtin_shaders[sh_cfg][shader];
 
 	if (*sh_p == NULL) {
 		GPUShaderStages stages_legacy = {NULL};
@@ -1199,10 +1199,10 @@ GPUShader *GPU_shader_get_builtin_shader_with_config(
 		}
 
 		/* common case */
-		if (shader_cfg == GPU_SHADER_CFG_DEFAULT) {
+		if (sh_cfg == GPU_SHADER_CFG_DEFAULT) {
 			*sh_p = GPU_shader_create(stages->vert, stages->frag, stages->geom, NULL, stages->defs, __func__);
 		}
-		else if (shader_cfg == GPU_SHADER_CFG_CLIPPED) {
+		else if (sh_cfg == GPU_SHADER_CFG_CLIPPED) {
 			/* Remove eventually, for now ensure support for each shader has been added. */
 			BLI_assert(ELEM(shader,
 			                GPU_SHADER_3D_UNIFORM_COLOR,