[Bf-blender-cvs] [70bb61ba97c] master: Cleanup: Fix warnings in gpu_batch

Ray Molenkamp noreply at git.blender.org
Mon May 27 16:30:59 CEST 2019


Commit: 70bb61ba97c45eae4864d348f3f67da7d13eb0ba
Author: Ray Molenkamp
Date:   Mon May 27 08:30:53 2019 -0600
Branches: master
https://developer.blender.org/rB70bb61ba97c45eae4864d348f3f67da7d13eb0ba

Cleanup: Fix warnings in gpu_batch

Passing a const pointer to MEM_freeN/MEM_recallocN lead to

C4090	'function': different 'const' qualifiers

warnings with MSVC

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

M	source/blender/gpu/intern/gpu_batch.c

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

diff --git a/source/blender/gpu/intern/gpu_batch.c b/source/blender/gpu/intern/gpu_batch.c
index 09c29cc1654..d1cfd5c337d 100644
--- a/source/blender/gpu/intern/gpu_batch.c
+++ b/source/blender/gpu/intern/gpu_batch.c
@@ -56,7 +56,7 @@ void GPU_batch_vao_cache_clear(GPUBatch *batch)
             (GPUShaderInterface *)batch->dynamic_vaos.interfaces[i], batch);
       }
     }
-    MEM_freeN(batch->dynamic_vaos.interfaces);
+    MEM_freeN((void *)batch->dynamic_vaos.interfaces);
     MEM_freeN(batch->dynamic_vaos.vao_ids);
   }
   else {
@@ -285,7 +285,7 @@ static GLuint batch_vao_get(GPUBatch *batch)
       /* Not enough place, realloc the array. */
       i = batch->dynamic_vaos.count;
       batch->dynamic_vaos.count += GPU_BATCH_VAO_DYN_ALLOC_COUNT;
-      batch->dynamic_vaos.interfaces = MEM_recallocN(batch->dynamic_vaos.interfaces,
+      batch->dynamic_vaos.interfaces = MEM_recallocN((void *)batch->dynamic_vaos.interfaces,
                                                      sizeof(GPUShaderInterface *) *
                                                          batch->dynamic_vaos.count);
       batch->dynamic_vaos.vao_ids = MEM_recallocN(batch->dynamic_vaos.vao_ids,



More information about the Bf-blender-cvs mailing list