[Bf-blender-cvs] [6f786aa7e65] uvimage-editor-drawing: CleanUp: Remove unused code

[Jeroen Bakker]

Commit: 6f786aa7e65b3f0b2df323e1ffd8f7b03f044485
Author: Jeroen Bakker
Date:   Tue Aug 18 16:39:26 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rB6f786aa7e65b3f0b2df323e1ffd8f7b03f044485

CleanUp: Remove unused code

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

M	source/blender/draw/engines/overlay/overlay_edit_uv.c
M	source/blender/draw/engines/overlay/shaders/edit_uv_tiled_image_borders_vert.glsl
M	source/blender/draw/intern/draw_cache.c
M	source/blender/draw/intern/draw_cache.h

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

diff --git a/source/blender/draw/engines/overlay/overlay_edit_uv.c b/source/blender/draw/engines/overlay/overlay_edit_uv.c
index 54c512da60d..a34faa4cee0 100644
--- a/source/blender/draw/engines/overlay/overlay_edit_uv.c
+++ b/source/blender/draw/engines/overlay/overlay_edit_uv.c
@@ -65,7 +65,7 @@ static OVERLAY_UVLineStyle edit_uv_line_style_from_space_image(const SpaceImage
   }
 }
 
-GPUBatch *edit_uv_tiled_border_gpu_batch_create(Image *image)
+static GPUBatch *edit_uv_tiled_border_gpu_batch_create(Image *image)
 {
   BLI_assert(image);
   BLI_assert(image->source == IMA_SRC_TILED);
diff --git a/source/blender/draw/engines/overlay/shaders/edit_uv_tiled_image_borders_vert.glsl b/source/blender/draw/engines/overlay/shaders/edit_uv_tiled_image_borders_vert.glsl
index b4ebdd96b8c..6adc06ed524 100644
--- a/source/blender/draw/engines/overlay/shaders/edit_uv_tiled_image_borders_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/edit_uv_tiled_image_borders_vert.glsl
@@ -1,14 +1,10 @@
 #pragma BLENDER_REQUIRE(common_view_lib.glsl)
 uniform vec3 offset;
 
-/* ---- Instantiated Attrs ---- */
 in vec3 pos;
 
-/* ---- Per instance Attrs ---- */
-in vec3 local_pos;
-
 void main()
 {
-  vec4 position = point_object_to_ndc(pos + local_pos + offset);
+  vec4 position = point_object_to_ndc(pos + offset);
   gl_Position = position;
 }
diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c
index 8c62abaa1d4..96aa970f76b 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -86,7 +86,6 @@ static struct DRWShapeCache {
   GPUBatch *drw_cursor_only_circle;
   GPUBatch *drw_fullscreen_quad;
   GPUBatch *drw_quad;
-  GPUBatch *drw_quad_image;
   GPUBatch *drw_quad_image_wires;
   GPUBatch *drw_quad_wires;
   GPUBatch *drw_grid;
@@ -400,26 +399,6 @@ GPUBatch *DRW_cache_quad_get(void)
   return SHC.drw_quad;
 }
 
-GPUBatch *DRW_cache_quad_image_get(void)
-{
-  if (!SHC.drw_quad_image) {
-    GPUVertFormat format = extra_vert_format();
-
-    GPUVertBuf *vbo = GPU_vertbuf_create_with_format(&format);
-    GPU_vertbuf_data_alloc(vbo, 4);
-
-    int v = 0;
-    int flag = VCLASS_EMPTY_SCALED;
-    float p[4][2] = {{0.0f, 0.0f}, {0.0f, 1.0f}, {1.0f, 1.0f}, {1.0f, 0.0f}};
-    for (int a = 0; a < 4; a++) {
-      GPU_vertbuf_vert_set(vbo, v++, &(Vert){{p[a][0], p[a][1], 0.0f}, flag});
-    }
-
-    SHC.drw_quad_image = GPU_batch_create_ex(GPU_PRIM_TRI_FAN, vbo, NULL, GPU_BATCH_OWNS_VBO);
-  }
-  return SHC.drw_quad_image;
-}
-
 GPUBatch *DRW_cache_quad_image_wires_get(void)
 {
   if (!SHC.drw_quad_image_wires) {
diff --git a/source/blender/draw/intern/draw_cache.h b/source/blender/draw/intern/draw_cache.h
index 7a5a725ed1d..4b631ce6391 100644
--- a/source/blender/draw/intern/draw_cache.h
+++ b/source/blender/draw/intern/draw_cache.h
@@ -42,7 +42,6 @@ struct GPUBatch *DRW_cache_groundline_get(void);
 struct GPUBatch *DRW_cache_grid_get(void);
 struct GPUBatch *DRW_cache_fullscreen_quad_get(void);
 struct GPUBatch *DRW_cache_quad_get(void);
-struct GPUBatch *DRW_cache_quad_image_get(void);
 struct GPUBatch *DRW_cache_quad_image_wires_get(void);
 struct GPUBatch *DRW_cache_quad_wires_get(void);
 struct GPUBatch *DRW_cache_cube_get(void);