Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/gpu/intern')
-rw-r--r--source/blender/gpu/intern/gpu_batch.cc4
-rw-r--r--source/blender/gpu/intern/gpu_codegen.c2
-rw-r--r--source/blender/gpu/intern/gpu_texture_private.hh10
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/gpu/intern/gpu_batch.cc b/source/blender/gpu/intern/gpu_batch.cc
index 9dc24c59e22..677777132e6 100644
--- a/source/blender/gpu/intern/gpu_batch.cc
+++ b/source/blender/gpu/intern/gpu_batch.cc
@@ -184,7 +184,7 @@ int GPU_batch_instbuf_add_ex(GPUBatch *batch, GPUVertBuf *insts, bool own_vbo)
}
}
/* we only make it this far if there is no room for another GPUVertBuf */
- BLI_assert(0 && "Not enough Instance VBO slot in batch");
+ BLI_assert_msg(0, "Not enough Instance VBO slot in batch");
return -1;
}
@@ -207,7 +207,7 @@ int GPU_batch_vertbuf_add_ex(GPUBatch *batch, GPUVertBuf *verts, bool own_vbo)
}
}
/* we only make it this far if there is no room for another GPUVertBuf */
- BLI_assert(0 && "Not enough VBO slot in batch");
+ BLI_assert_msg(0, "Not enough VBO slot in batch");
return -1;
}
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c
index d12cecd129e..bb1ebc0e85d 100644
--- a/source/blender/gpu/intern/gpu_codegen.c
+++ b/source/blender/gpu/intern/gpu_codegen.c
@@ -657,7 +657,7 @@ static const char *attr_prefix_get(CustomDataType type)
case CD_AUTO_FROM_NAME:
return "a";
default:
- BLI_assert(false && "GPUVertAttr Prefix type not found : This should not happen!");
+ BLI_assert_msg(0, "GPUVertAttr Prefix type not found : This should not happen!");
return "";
}
}
diff --git a/source/blender/gpu/intern/gpu_texture_private.hh b/source/blender/gpu/intern/gpu_texture_private.hh
index 2b8a5a5cc12..26be6f57312 100644
--- a/source/blender/gpu/intern/gpu_texture_private.hh
+++ b/source/blender/gpu/intern/gpu_texture_private.hh
@@ -316,7 +316,7 @@ inline size_t to_bytesize(eGPUTextureFormat format)
case GPU_RGBA8_DXT5:
return 1; /* Incorrect but actual size is fractional. */
default:
- BLI_assert(!"Texture format incorrect or unsupported\n");
+ BLI_assert_msg(0, "Texture format incorrect or unsupported");
return 0;
}
}
@@ -333,7 +333,7 @@ inline size_t to_block_size(eGPUTextureFormat data_type)
case GPU_RGBA8_DXT5:
return 16;
default:
- BLI_assert(!"Texture format is not a compressed format\n");
+ BLI_assert_msg(0, "Texture format is not a compressed format");
return 0;
}
}
@@ -407,7 +407,7 @@ inline size_t to_bytesize(eGPUDataFormat data_format)
case GPU_DATA_2_10_10_10_REV:
return 4;
default:
- BLI_assert(!"Data format incorrect or unsupported\n");
+ BLI_assert_msg(0, "Data format incorrect or unsupported");
return 0;
}
}
@@ -503,7 +503,7 @@ inline eGPUFrameBufferBits to_framebuffer_bits(eGPUTextureFormat tex_format)
static inline eGPUTextureFormat to_texture_format(const GPUVertFormat *format)
{
if (format->attr_len > 1 || format->attr_len == 0) {
- BLI_assert(!"Incorrect vertex format for buffer texture");
+ BLI_assert_msg(0, "Incorrect vertex format for buffer texture");
return GPU_DEPTH_COMPONENT24;
}
switch (format->attrs[0].comp_len) {
@@ -584,7 +584,7 @@ static inline eGPUTextureFormat to_texture_format(const GPUVertFormat *format)
default:
break;
}
- BLI_assert(!"Unsupported vertex format for buffer texture");
+ BLI_assert_msg(0, "Unsupported vertex format for buffer texture");
return GPU_DEPTH_COMPONENT24;
}