From 200778511e331c78af0413b6523b181b1146d85d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Thu, 24 Jan 2019 20:35:09 -0800 Subject: [PATCH] Cleanup. --- src/bgfx.cpp | 2 +- src/bgfx_p.h | 2 +- src/renderer_d3d11.cpp | 10 +++++----- src/renderer_d3d12.cpp | 10 +++++----- src/renderer_d3d9.cpp | 4 ++-- src/renderer_gl.cpp | 8 ++++---- src/renderer_mtl.mm | 4 +++- src/renderer_noop.cpp | 2 +- src/renderer_vk.cpp | 4 ++-- 9 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/bgfx.cpp b/src/bgfx.cpp index d36c18806..cd2022cf1 100644 --- a/src/bgfx.cpp +++ b/src/bgfx.cpp @@ -3110,7 +3110,7 @@ namespace bgfx const char* name = (const char*)_cmdbuf.skip(len); - m_renderCtx->setName(handle, name); + m_renderCtx->setName(handle, name, len-1); } break; diff --git a/src/bgfx_p.h b/src/bgfx_p.h index 6184fbf88..7c0934d39 100644 --- a/src/bgfx_p.h +++ b/src/bgfx_p.h @@ -2771,7 +2771,7 @@ namespace bgfx virtual void updateUniform(uint16_t _loc, const void* _data, uint32_t _size) = 0; virtual void setMarker(const char* _marker, uint32_t _size) = 0; virtual void invalidateOcclusionQuery(OcclusionQueryHandle _handle) = 0; - virtual void setName(Handle _handle, const char* _name) = 0; + virtual void setName(Handle _handle, const char* _name, uint16_t _len) = 0; virtual void submit(Frame* _render, ClearQuad& _clearQuad, TextVideoMemBlitter& _textVideoMemBlitter) = 0; virtual void blitSetup(TextVideoMemBlitter& _blitter) = 0; virtual void blitRender(TextVideoMemBlitter& _blitter, uint32_t _numIndices) = 0; diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index fdf839485..6d9d9f45d 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -1997,24 +1997,24 @@ namespace bgfx { namespace d3d11 m_occlusionQuery.invalidate(_handle); } - virtual void setName(Handle _handle, const char* _name) override + virtual void setName(Handle _handle, const char* _name, uint16_t _len) override { switch (_handle.type) { case Handle::IndexBuffer: - setDebugObjectName(m_indexBuffers[_handle.idx].m_ptr, "%s", _name); + setDebugObjectName(m_indexBuffers[_handle.idx].m_ptr, "%.*s", _len, _name); break; case Handle::Shader: - setDebugObjectName(m_shaders[_handle.idx].m_ptr, "%s", _name); + setDebugObjectName(m_shaders[_handle.idx].m_ptr, "%.*s", _len, _name); break; case Handle::Texture: - setDebugObjectName(m_textures[_handle.idx].m_ptr, "%s", _name); + setDebugObjectName(m_textures[_handle.idx].m_ptr, "%.*s", _len, _name); break; case Handle::VertexBuffer: - setDebugObjectName(m_vertexBuffers[_handle.idx].m_ptr, "%s", _name); + setDebugObjectName(m_vertexBuffers[_handle.idx].m_ptr, "%.*s", _len, _name); break; default: diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp index c39076348..daa67fdd0 100644 --- a/src/renderer_d3d12.cpp +++ b/src/renderer_d3d12.cpp @@ -1872,24 +1872,24 @@ namespace bgfx { namespace d3d12 m_occlusionQuery.invalidate(_handle); } - virtual void setName(Handle _handle, const char* _name) override + virtual void setName(Handle _handle, const char* _name, uint16_t _len) override { switch (_handle.type) { case Handle::IndexBuffer: - setDebugObjectName(m_indexBuffers[_handle.idx].m_ptr, "%s", _name); + setDebugObjectName(m_indexBuffers[_handle.idx].m_ptr, "%.*s", _len, _name); break; case Handle::Shader: -// setDebugObjectName(m_shaders[_handle.idx].m_ptr, "%s", _name); +// setDebugObjectName(m_shaders[_handle.idx].m_ptr, "%.*s", _len, _name); break; case Handle::Texture: - setDebugObjectName(m_textures[_handle.idx].m_ptr, "%s", _name); + setDebugObjectName(m_textures[_handle.idx].m_ptr, "%.*s", _len, _name); break; case Handle::VertexBuffer: - setDebugObjectName(m_vertexBuffers[_handle.idx].m_ptr, "%s", _name); + setDebugObjectName(m_vertexBuffers[_handle.idx].m_ptr, "%.*s", _len, _name); break; default: diff --git a/src/renderer_d3d9.cpp b/src/renderer_d3d9.cpp index 39c4baf7c..5722187b3 100644 --- a/src/renderer_d3d9.cpp +++ b/src/renderer_d3d9.cpp @@ -1296,9 +1296,9 @@ namespace bgfx { namespace d3d9 m_occlusionQuery.invalidate(_handle); } - virtual void setName(Handle _handle, const char* _name) override + virtual void setName(Handle _handle, const char* _name, uint16_t _len) override { - BX_UNUSED(_handle, _name) + BX_UNUSED(_handle, _name, _len) } void submitBlit(BlitState& _bs, uint16_t _view); diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 4be93116c..588b2e9a8 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -2527,7 +2527,7 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) ); glInsertEventMarker = stubInsertEventMarker; } - m_maxLabelLen = (uint32_t)glGet(GL_MAX_LABEL_LENGTH); + m_maxLabelLen = uint16_t(glGet(GL_MAX_LABEL_LENGTH) ); setGraphicsDebuggerPresent(s_extension[Extension::EXT_debug_tool].m_supported); @@ -2990,9 +2990,9 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) ); m_occlusionQuery.invalidate(_handle); } - virtual void setName(Handle _handle, const char* _name) override + virtual void setName(Handle _handle, const char* _name, uint16_t _len) override { - uint32_t len = bx::strLen(_name, m_maxLabelLen); + uint16_t len = bx::min(_len, m_maxLabelLen); switch (_handle.type) { @@ -3873,8 +3873,8 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) ); float m_maxAnisotropy; float m_maxAnisotropyDefault; int32_t m_maxMsaa; - uint32_t m_maxLabelLen; GLuint m_vao; + uint16_t m_maxLabelLen; bool m_blitSupported; bool m_readBackSupported; bool m_vaoSupport; diff --git a/src/renderer_mtl.mm b/src/renderer_mtl.mm index 033a3e5a3..53b998bd9 100644 --- a/src/renderer_mtl.mm +++ b/src/renderer_mtl.mm @@ -1015,8 +1015,10 @@ namespace bgfx { namespace mtl m_occlusionQuery.invalidate(_handle); } - virtual void setName(Handle _handle, const char* _name) override + virtual void setName(Handle _handle, const char* _name, uint16_t _len) override { + BX_UNUSED(_len); + switch (_handle.type) { case Handle::IndexBuffer: diff --git a/src/renderer_noop.cpp b/src/renderer_noop.cpp index 819165eb1..23843e6c5 100644 --- a/src/renderer_noop.cpp +++ b/src/renderer_noop.cpp @@ -234,7 +234,7 @@ namespace bgfx { namespace noop { } - virtual void setName(Handle /*_handle*/, const char* /*_name*/) override + virtual void setName(Handle /*_handle*/, const char* /*_name*/, uint16_t /*_len*/) override { } diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp index b73ad303c..353d9917e 100644 --- a/src/renderer_vk.cpp +++ b/src/renderer_vk.cpp @@ -2157,9 +2157,9 @@ VK_IMPORT_DEVICE BX_UNUSED(_handle); } - virtual void setName(Handle _handle, const char* _name) override + virtual void setName(Handle _handle, const char* _name, uint16_t _len) override { - BX_UNUSED(_handle, _name) + BX_UNUSED(_handle, _name, _len) } void submitBlit(BlitState& _bs, uint16_t _view);