Revert "DRW: Refactor to support draw call batching"

This reverts commit ce34a6b0d727bbde6ae373afa8ec6c42bc8980ce.

1 files changed, 4 insertions, 21 deletions

diff --git a/source/blender/gpu/intern/gpu_viewport.c b/source/blender/gpu/intern/gpu_viewport.c
index 615af57c1bd..fcb1a008226 100644
--- a/source/blender/gpu/intern/gpu_viewport.c
+++ b/source/blender/gpu/intern/gpu_viewport.c
@@ -39,7 +39,6 @@
 #include "GPU_immediate.h"
 #include "GPU_texture.h"
 #include "GPU_viewport.h"
-#include "GPU_uniformbuffer.h"
 
 #include "DRW_engine.h"
 
@@ -620,20 +619,11 @@ void GPU_viewport_free(GPUViewport *viewport)
   MEM_freeN(viewport->fbl);
   MEM_freeN(viewport->txl);
 
-  if (viewport->vmempool.commands != NULL) {
-    BLI_memblock_destroy(viewport->vmempool.commands, NULL);
+  if (viewport->vmempool.calls != NULL) {
+    BLI_memblock_destroy(viewport->vmempool.calls, NULL);
   }
-  if (viewport->vmempool.commands_small != NULL) {
-    BLI_memblock_destroy(viewport->vmempool.commands_small, NULL);
-  }
-  if (viewport->vmempool.callbuffers != NULL) {
-    BLI_memblock_destroy(viewport->vmempool.callbuffers, NULL);
-  }
-  if (viewport->vmempool.obmats != NULL) {
-    BLI_memblock_destroy(viewport->vmempool.obmats, NULL);
-  }
-  if (viewport->vmempool.obinfos != NULL) {
-    BLI_memblock_destroy(viewport->vmempool.obinfos, NULL);
+  if (viewport->vmempool.states != NULL) {
+    BLI_memblock_destroy(viewport->vmempool.states, NULL);
   }
   if (viewport->vmempool.cullstates != NULL) {
     BLI_memblock_destroy(viewport->vmempool.cullstates, NULL);
@@ -660,13 +650,6 @@ void GPU_viewport_free(GPUViewport *viewport)
     BLI_memblock_destroy(viewport->vmempool.images, NULL);
   }
 
-  for (int i = 0; i < viewport->vmempool.ubo_len; i++) {
-    GPU_uniformbuffer_free(viewport->vmempool.matrices_ubo[i]);
-    GPU_uniformbuffer_free(viewport->vmempool.obinfos_ubo[i]);
-  }
-  MEM_SAFE_FREE(viewport->vmempool.matrices_ubo);
-  MEM_SAFE_FREE(viewport->vmempool.obinfos_ubo);
-
   DRW_instance_data_list_free(viewport->idatalist);
   MEM_freeN(viewport->idatalist);