From be7600e560349d22033c170f995de2e2038d4950 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Mon, 2 Jul 2012 20:53:12 -0700 Subject: [PATCH] Fixed unused variables. --- src/bgfx.cpp | 8 ++++++- src/bgfx_p.h | 5 ++-- src/renderer_d3d9.cpp | 8 +++---- src/renderer_gl.cpp | 10 ++++---- src/renderer_null.cpp | 54 +++++++++++++++++++++---------------------- 5 files changed, 46 insertions(+), 39 deletions(-) diff --git a/src/bgfx.cpp b/src/bgfx.cpp index a63d0122e..21b20a086 100644 --- a/src/bgfx.cpp +++ b/src/bgfx.cpp @@ -40,6 +40,8 @@ namespace bgfx void fatalStub(bgfx::Fatal::Enum _code, const char* _str) { BX_TRACE("0x%08x: %s", _code, _str); + BX_UNUSED(_code); + BX_UNUSED(_str); } void* reallocStub(void* _ptr, size_t _size) @@ -56,7 +58,7 @@ namespace bgfx ::free(_ptr); } - void cacheStub(uint64_t _id, bool _store, void* _data, uint32_t& _length) + void cacheStub(uint64_t /*_id*/, bool /*_store*/, void* /*_data*/, uint32_t& _length) { _length = 0; } @@ -604,6 +606,8 @@ namespace bgfx ); } } +#else + BX_UNUSED(_decl); #endif // BGFX_CONFIG_DEBUG } @@ -664,6 +668,8 @@ namespace bgfx pthread_create(&m_renderThread, NULL, renderThread, NULL); # endif // BX_PLATFORM_ } +#else + BX_UNUSED(_createRenderThread); #endif // BGFX_CONFIG_MULTITHREADED memset(m_rt, 0xff, sizeof(m_rt) ); diff --git a/src/bgfx_p.h b/src/bgfx_p.h index b94491c82..8e7450954 100644 --- a/src/bgfx_p.h +++ b/src/bgfx_p.h @@ -12,6 +12,7 @@ #include #include #include +#include extern void dbgPrintf(const char* _format, ...); extern void dbgPrintfData(const void* _data, uint32_t _size, const char* _format, ...); @@ -773,7 +774,7 @@ namespace bgfx void writeUniform(ConstantType::Enum _type, uint16_t _loc, const void* _value, uint16_t _num = 1); void writeUniformRef(ConstantType::Enum _type, uint16_t _loc, const void* _value, uint16_t _num = 1); - void commit(bool _force); + void commit(); private: ConstantBuffer(uint32_t _size) @@ -2018,7 +2019,7 @@ namespace bgfx m_submit->writeConstant(constant.m_type, _handle, _value, uint16_min(constant.m_num, _num) ); } - void setUniform(MaterialHandle _material, UniformHandle _handle, const void* _value) + void setUniform(MaterialHandle /*_material*/, UniformHandle /*_handle*/, const void* /*_value*/) { BX_CHECK(false, "NOT IMPLEMENTED!"); } diff --git a/src/renderer_d3d9.cpp b/src/renderer_d3d9.cpp index 36e9354b7..556a2b9e3 100644 --- a/src/renderer_d3d9.cpp +++ b/src/renderer_d3d9.cpp @@ -964,7 +964,6 @@ namespace bgfx } } - (void)kind; // explicitly ignore unused variable kind in non-debug builds BX_TRACE("\t%s: %s, type %2d, num %2d, r.index %3d, r.count %2d" , kind , name @@ -973,6 +972,7 @@ namespace bgfx , regIndex , regCount ); + BX_UNUSED(kind); } uint16_t shaderSize; @@ -1460,7 +1460,7 @@ namespace bgfx #endif // BX_PLATFORM_WINDOWS } - void ConstantBuffer::commit(bool _force) + void ConstantBuffer::commit() { reset(); @@ -1987,8 +1987,8 @@ namespace bgfx if (constantsChanged) { Material& material = s_renderCtx.m_materials[materialIdx]; - material.m_vsh->m_constantBuffer->commit(materialChanged); - material.m_fsh->m_constantBuffer->commit(materialChanged); + material.m_vsh->m_constantBuffer->commit(); + material.m_fsh->m_constantBuffer->commit(); } for (uint32_t ii = 0, num = material.m_numPredefined; ii < num; ++ii) diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 13e3edea7..e50d4e61d 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -966,7 +966,7 @@ namespace bgfx , data , offset ); - (void)offset; + BX_UNUSED(offset); } m_constantBuffer->finish(); @@ -1468,7 +1468,7 @@ namespace bgfx m_depth.destroy(); } - void ConstantBuffer::commit(bool _force) + void ConstantBuffer::commit() { reset(); @@ -1686,7 +1686,7 @@ namespace bgfx } BX_TRACE("GL_EXTENSION%s: %s", supported ? " (supported)" : "", name); - (void)supported; + BX_UNUSED(supported); pos += len+1; } @@ -1733,7 +1733,7 @@ namespace bgfx dump(decl); } - void Context::rendererDestroyVertexDecl(VertexDeclHandle _handle) + void Context::rendererDestroyVertexDecl(VertexDeclHandle /*_handle*/) { } @@ -2107,7 +2107,7 @@ namespace bgfx if (constantsChanged) { - material.m_constantBuffer->commit(materialChanged); + material.m_constantBuffer->commit(); } for (uint32_t ii = 0, num = material.m_numPredefined; ii < num; ++ii) diff --git a/src/renderer_null.cpp b/src/renderer_null.cpp index 8894334e7..a3420ca33 100644 --- a/src/renderer_null.cpp +++ b/src/renderer_null.cpp @@ -9,7 +9,7 @@ namespace bgfx { - void ConstantBuffer::commit(bool _force) + void ConstantBuffer::commit() { } @@ -17,7 +17,7 @@ namespace bgfx { } - void TextVideoMemBlitter::render(uint32_t _numIndices) + void TextVideoMemBlitter::render(uint32_t /*_numIndices*/) { } @@ -33,103 +33,103 @@ namespace bgfx { } - void Context::rendererCreateIndexBuffer(IndexBufferHandle _handle, Memory* _mem) + void Context::rendererCreateIndexBuffer(IndexBufferHandle /*_handle*/, Memory* /*_mem*/) { } - void Context::rendererDestroyIndexBuffer(IndexBufferHandle _handle) + void Context::rendererDestroyIndexBuffer(IndexBufferHandle /*_handle*/) { } - void Context::rendererCreateVertexDecl(VertexDeclHandle _handle, const VertexDecl& _decl) + void Context::rendererCreateVertexDecl(VertexDeclHandle /*_handle*/, const VertexDecl& /*_decl*/) { } - void Context::rendererDestroyVertexDecl(VertexDeclHandle _handle) + void Context::rendererDestroyVertexDecl(VertexDeclHandle /*_handle*/) { } - void Context::rendererCreateVertexBuffer(VertexBufferHandle _handle, Memory* _mem, VertexDeclHandle _declHandle) + void Context::rendererCreateVertexBuffer(VertexBufferHandle /*_handle*/, Memory* /*_mem*/, VertexDeclHandle /*_declHandle*/) { } - void Context::rendererDestroyVertexBuffer(VertexBufferHandle _handle) + void Context::rendererDestroyVertexBuffer(VertexBufferHandle /*_handle*/) { } - void Context::rendererCreateDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _size) + void Context::rendererCreateDynamicIndexBuffer(IndexBufferHandle /*_handle*/, uint32_t /*_size*/) { } - void Context::rendererUpdateDynamicIndexBuffer(IndexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) + void Context::rendererUpdateDynamicIndexBuffer(IndexBufferHandle /*_handle*/, uint32_t /*_offset*/, uint32_t /*_size*/, Memory* /*_mem*/) { } - void Context::rendererDestroyDynamicIndexBuffer(IndexBufferHandle _handle) + void Context::rendererDestroyDynamicIndexBuffer(IndexBufferHandle /*_handle*/) { } - void Context::rendererCreateDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _size) + void Context::rendererCreateDynamicVertexBuffer(VertexBufferHandle /*_handle*/, uint32_t /*_size*/) { } - void Context::rendererUpdateDynamicVertexBuffer(VertexBufferHandle _handle, uint32_t _offset, uint32_t _size, Memory* _mem) + void Context::rendererUpdateDynamicVertexBuffer(VertexBufferHandle /*_handle*/, uint32_t /*_offset*/, uint32_t /*_size*/, Memory* /*_mem*/) { } - void Context::rendererDestroyDynamicVertexBuffer(uint16_t _pool) + void Context::rendererDestroyDynamicVertexBuffer(VertexBufferHandle /*_handle*/) { } - void Context::rendererCreateVertexShader(VertexShaderHandle _handle, Memory* _mem) + void Context::rendererCreateVertexShader(VertexShaderHandle /*_handle*/, Memory* /*_mem*/) { } - void Context::rendererDestroyVertexShader(VertexShaderHandle _handle) + void Context::rendererDestroyVertexShader(VertexShaderHandle /*_handle*/) { } - void Context::rendererCreateFragmentShader(FragmentShaderHandle _handle, Memory* _mem) + void Context::rendererCreateFragmentShader(FragmentShaderHandle /*_handle*/, Memory* /*_mem*/) { } - void Context::rendererDestroyFragmentShader(FragmentShaderHandle _handle) + void Context::rendererDestroyFragmentShader(FragmentShaderHandle /*_handle*/) { } - void Context::rendererCreateMaterial(MaterialHandle _handle, VertexShaderHandle _vsh, FragmentShaderHandle _fsh) + void Context::rendererCreateMaterial(MaterialHandle /*_handle*/, VertexShaderHandle /*_vsh*/, FragmentShaderHandle /*_fsh*/) { } - void Context::rendererDestroyMaterial(FragmentShaderHandle _handle) + void Context::rendererDestroyMaterial(FragmentShaderHandle /*_handle*/) { } - void Context::rendererCreateTexture(TextureHandle _handle, Memory* _mem, uint32_t _flags) + void Context::rendererCreateTexture(TextureHandle /*_handle*/, Memory* /*_mem*/, uint32_t /*_flags*/) { } - void Context::rendererDestroyTexture(TextureHandle _handle) + void Context::rendererDestroyTexture(TextureHandle /*_handle*/) { } - void Context::rendererCreateRenderTarget(RenderTargetHandle _handle, uint16_t _width, uint16_t _height, uint32_t _flags, uint32_t _textureFlags) + void Context::rendererCreateRenderTarget(RenderTargetHandle /*_handle*/, uint16_t /*_width*/, uint16_t /*_height*/, uint32_t /*_flags*/, uint32_t /*_textureFlags*/) { } - void Context::rendererDestroyRenderTarget(RenderTargetHandle _handle) + void Context::rendererDestroyRenderTarget(RenderTargetHandle /*_handle*/) { } - void Context::rendererCreateUniform(UniformHandle _handle, ConstantType::Enum _type, uint16_t _num, const char* _name) + void Context::rendererCreateUniform(UniformHandle /*_handle*/, ConstantType::Enum /*_type*/, uint16_t /*_num*/, const char* /*_name*/) { } - void Context::rendererDestroyUniform(UniformHandle _handle) + void Context::rendererDestroyUniform(UniformHandle /*_handle*/) { } - void Context::rendererSaveScreenShot(Memory* _mem) + void Context::rendererSaveScreenShot(Memory* /*_mem*/) { }