[Bf-blender-cvs] [8ca0d4af36e] uvimage-editor-drawing: CleanUp: Rename image_shaders.c to image_shader.c

[Jeroen Bakker]

Commit: 8ca0d4af36ed7c3dcd850ef6cb95b918e5fbb66b
Author: Jeroen Bakker
Date:   Mon Aug 24 08:48:40 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rB8ca0d4af36ed7c3dcd850ef6cb95b918e5fbb66b

CleanUp: Rename image_shaders.c to image_shader.c

===================================================================

M	source/blender/draw/CMakeLists.txt
M	source/blender/draw/engines/image/image_engine.c
M	source/blender/draw/engines/image/image_private.h
R095	source/blender/draw/engines/image/image_shaders.c	source/blender/draw/engines/image/image_shader.c

===================================================================

diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 798e066c318..afe7153981f 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -79,7 +79,7 @@ set(SRC
   engines/basic/basic_engine.c
   engines/image/image_batches.c
   engines/image/image_engine.c
-  engines/image/image_shaders.c
+  engines/image/image_shader.c
   engines/eevee/eevee_bloom.c
   engines/eevee/eevee_data.c
   engines/eevee/eevee_depth_of_field.c
diff --git a/source/blender/draw/engines/image/image_engine.c b/source/blender/draw/engines/image/image_engine.c
index 9b7a78983b1..b318d1e290a 100644
--- a/source/blender/draw/engines/image/image_engine.c
+++ b/source/blender/draw/engines/image/image_engine.c
@@ -178,7 +178,7 @@ static void image_cache_image(IMAGE_Data *vedata, Image *image, ImageUser *iuser
       copy_v4_fl4(shuffle, 0.0f, 0.0f, 1.0f, 0.0f);
     }
 
-    GPUShader *shader = IMAGE_shaders_image_get();
+    GPUShader *shader = IMAGE_shader_image_get();
     DRWShadingGroup *shgrp = DRW_shgroup_create(shader, psl->image_pass);
     if (tex_tile_data != NULL) {
       draw_flags |= SIMA_DRAW_FLAG_TILED;
@@ -211,7 +211,7 @@ static void image_cache_image(IMAGE_Data *vedata, Image *image, ImageUser *iuser
     float zoom_level = powf(MAX2(sima->zoom - 1.0, 0.1), 0.33f);
     zoom_level = clamp_f(zoom_level, 1.25, 4.75);
 
-    GPUShader *shader = IMAGE_shaders_image_unavailable_get();
+    GPUShader *shader = IMAGE_shader_image_unavailable_get();
     DRWShadingGroup *grp = DRW_shgroup_create(shader, psl->image_pass);
     DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo);
     DRW_shgroup_uniform_float_copy(grp, "zoomScale", sima->zoom);
@@ -306,7 +306,7 @@ static void IMAGE_draw_scene(void *ved)
 
 static void IMAGE_engine_free(void)
 {
-  IMAGE_shaders_free();
+  IMAGE_shader_free();
 }
 
 /* \} */
diff --git a/source/blender/draw/engines/image/image_private.h b/source/blender/draw/engines/image/image_private.h
index c9bddbd4912..136f068d2ef 100644
--- a/source/blender/draw/engines/image/image_private.h
+++ b/source/blender/draw/engines/image/image_private.h
@@ -57,11 +57,11 @@ typedef struct IMAGE_Data {
   IMAGE_StorageList *stl;
 } IMAGE_Data;
 
-/* image_shaders.c */
-GPUShader *IMAGE_shaders_image_get(void);
-GPUShader *IMAGE_shaders_image_unavailable_get(void);
+/* image_shader.c */
+GPUShader *IMAGE_shader_image_get(void);
+GPUShader *IMAGE_shader_image_unavailable_get(void);
 void IMAGE_shader_library_ensure(void);
-void IMAGE_shaders_free(void);
+void IMAGE_shader_free(void);
 
 /* image_batches.c */
 struct GPUBatch *IMAGE_batches_image_create(struct rcti *rect);
diff --git a/source/blender/draw/engines/image/image_shaders.c b/source/blender/draw/engines/image/image_shader.c
similarity index 95%
rename from source/blender/draw/engines/image/image_shaders.c
rename to source/blender/draw/engines/image/image_shader.c
index 3ba9a77e764..5e71fbbac08 100644
--- a/source/blender/draw/engines/image/image_shaders.c
+++ b/source/blender/draw/engines/image/image_shader.c
@@ -62,7 +62,7 @@ void IMAGE_shader_library_ensure(void)
 /* -------------------------------------------------------------------- */
 /** \name Image Shaders
  * \{ */
-GPUShader *IMAGE_shaders_image_get(void)
+GPUShader *IMAGE_shader_image_get(void)
 {
   IMAGE_Shaders *sh_data = &e_data.shaders;
   if (!sh_data->image_sh) {
@@ -72,7 +72,7 @@ GPUShader *IMAGE_shaders_image_get(void)
   return sh_data->image_sh;
 }
 
-GPUShader *IMAGE_shaders_image_unavailable_get(void)
+GPUShader *IMAGE_shader_image_unavailable_get(void)
 {
   IMAGE_Shaders *sh_data = &e_data.shaders;
   if (!sh_data->image_unavailable_sh) {
@@ -86,7 +86,7 @@ GPUShader *IMAGE_shaders_image_unavailable_get(void)
   return sh_data->image_unavailable_sh;
 }
 /* \} */
-void IMAGE_shaders_free(void)
+void IMAGE_shader_free(void)
 {
   GPUShader **sh_data_as_array = (GPUShader **)&e_data.shaders;
   for (int i = 0; i < (sizeof(IMAGE_Shaders) / sizeof(GPUShader *)); i++) {