Revert "DRW: Refactor to support draw call batching"

This reverts commit ce34a6b0d7.
2019-09-13 23:02:45 +02:00
parent c80564ef9f
commit fd5c1972cd
57 changed files with 1264 additions and 2286 deletions
--- a/source/blender/gpu/intern/gpu_shader_interface.c
+++ b/source/blender/gpu/intern/gpu_shader_interface.c
@@ -65,8 +65,9 @@ static const char *BuiltinUniform_name(GPUUniformBuiltin u)
      [GPU_UNIFORM_CLIPPLANES] = "WorldClipPlanes",

      [GPU_UNIFORM_COLOR] = "color",
-      [GPU_UNIFORM_BASE_INSTANCE] = "baseInstance",
-      [GPU_UNIFORM_RESOURCE_CHUNK] = "resourceChunk",
+      [GPU_UNIFORM_CALLID] = "callId",
+      [GPU_UNIFORM_OBJECT_INFO] = "unfobjectinfo",
+      [GPU_UNIFORM_OBJECT_COLOR] = "unfobjectcolor",

      [GPU_UNIFORM_CUSTOM] = NULL,
      [GPU_NUM_UNIFORMS] = NULL,