diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-07-15 11:23:28 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-07-15 11:29:01 +0300 |
commit | 8e8a6b80cf2749d176d14eaa3bbfd0eccc9ec75e (patch) | |
tree | 7448ea0f5b8ab12f90d6d3201eab05f3618f674d /source/blender/gpu | |
parent | a63a0ee24bf05346399a16f42d92747e1cf6a815 (diff) |
Cleanup: replace BLI_assert(!"text") with BLI_assert_msg(0, "text")
This shows the text as part of the assertion message.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/intern/gpu_node_graph.c | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_texture.cc | 4 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_uniform_buffer.cc | 4 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_viewport.c | 2 | ||||
-rw-r--r-- | source/blender/gpu/opengl/gl_framebuffer.cc | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/gpu/intern/gpu_node_graph.c b/source/blender/gpu/intern/gpu_node_graph.c index dad03ab22e5..7646cce2a3e 100644 --- a/source/blender/gpu/intern/gpu_node_graph.c +++ b/source/blender/gpu/intern/gpu_node_graph.c @@ -174,7 +174,7 @@ static const char *gpu_uniform_set_function_from_type(eNodeSocketDatatype type) case SOCK_RGBA: return "set_rgba"; default: - BLI_assert(!"No gpu function for non-supported eNodeSocketDatatype"); + BLI_assert_msg(0, "No gpu function for non-supported eNodeSocketDatatype"); return NULL; } } diff --git a/source/blender/gpu/intern/gpu_texture.cc b/source/blender/gpu/intern/gpu_texture.cc index f7a4d672b02..6564cbda694 100644 --- a/source/blender/gpu/intern/gpu_texture.cc +++ b/source/blender/gpu/intern/gpu_texture.cc @@ -154,7 +154,7 @@ void Texture::attach_to(FrameBuffer *fb, GPUAttachmentType type) return; } } - BLI_assert(!"GPU: Error: Texture: Not enough attachment"); + BLI_assert_msg(0, "GPU: Error: Texture: Not enough attachment"); } void Texture::detach_from(FrameBuffer *fb) @@ -166,7 +166,7 @@ void Texture::detach_from(FrameBuffer *fb) return; } } - BLI_assert(!"GPU: Error: Texture: Framebuffer is not attached"); + BLI_assert_msg(0, "GPU: Error: Texture: Framebuffer is not attached"); } void Texture::update(eGPUDataFormat format, const void *data) diff --git a/source/blender/gpu/intern/gpu_uniform_buffer.cc b/source/blender/gpu/intern/gpu_uniform_buffer.cc index 3edb090d81c..3a9269d1753 100644 --- a/source/blender/gpu/intern/gpu_uniform_buffer.cc +++ b/source/blender/gpu/intern/gpu_uniform_buffer.cc @@ -114,11 +114,11 @@ static void buffer_from_list_inputs_sort(ListBase *inputs) if (input->type == GPU_MAT3) { /* Alignment for mat3 is not handled currently, so not supported */ - BLI_assert(!"mat3 not supported in UBO"); + BLI_assert_msg(0, "mat3 not supported in UBO"); continue; } if (input->type > MAX_UBO_GPU_TYPE) { - BLI_assert(!"GPU type not supported in UBO"); + BLI_assert_msg(0, "GPU type not supported in UBO"); continue; } diff --git a/source/blender/gpu/intern/gpu_viewport.c b/source/blender/gpu/intern/gpu_viewport.c index ddf31b6ffa7..96bf1ec40b0 100644 --- a/source/blender/gpu/intern/gpu_viewport.c +++ b/source/blender/gpu/intern/gpu_viewport.c @@ -248,7 +248,7 @@ void *GPU_viewport_engine_data_create(GPUViewport *viewport, void *engine_type) } } - BLI_assert(!"Too many draw engines enabled at the same time"); + BLI_assert_msg(0, "Too many draw engines enabled at the same time"); return NULL; } diff --git a/source/blender/gpu/opengl/gl_framebuffer.cc b/source/blender/gpu/opengl/gl_framebuffer.cc index e87b22985bd..8da114d9270 100644 --- a/source/blender/gpu/opengl/gl_framebuffer.cc +++ b/source/blender/gpu/opengl/gl_framebuffer.cc @@ -268,7 +268,7 @@ void GLFrameBuffer::bind(bool enabled_srgb) } if (context_ != GLContext::get()) { - BLI_assert(!"Trying to use the same frame-buffer in multiple context"); + BLI_assert_msg(0, "Trying to use the same frame-buffer in multiple context"); return; } @@ -379,7 +379,7 @@ void GLFrameBuffer::clear_attachment(GPUAttachmentType type, glClearBufferfv(GL_DEPTH, 0, &depth); } else { - BLI_assert(!"Unhandled data format"); + BLI_assert_msg(0, "Unhandled data format"); } } else { @@ -395,7 +395,7 @@ void GLFrameBuffer::clear_attachment(GPUAttachmentType type, glClearBufferiv(GL_COLOR, slot, (GLint *)clear_value); break; default: - BLI_assert(!"Unhandled data format"); + BLI_assert_msg(0, "Unhandled data format"); break; } } |