diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2019-05-27 17:30:53 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2019-05-27 17:30:53 +0300 |
| commit | 70bb61ba97c45eae4864d348f3f67da7d13eb0ba (patch) | |
| tree | 1d0c347e5e363b16293c4d7ced0944955581a231 /source/blender/gpu/intern | |
| parent | 063ebd5836a8fcd8100c266f9314158a4e2b1608 (diff) | |
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
Diffstat (limited to 'source/blender/gpu/intern')
| -rw-r--r-- | source/blender/gpu/intern/gpu_batch.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, |