From 03de737f0d18526b99b59a1810c7e290b66f4be2 Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Thu, 6 Jul 2017 11:11:01 -0700 Subject: Fix many warnings-as-errors issues. The code should now compile cleanly with warnings as errors for VS2015 with `W3`. Most of the changes had to do with propagating a real pointer-sized integer type through code that had been using `int`. --- tools/render-test/render-d3d11.cpp | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'tools/render-test/render-d3d11.cpp') diff --git a/tools/render-test/render-d3d11.cpp b/tools/render-test/render-d3d11.cpp index 5b25714c0..2627d7b1f 100644 --- a/tools/render-test/render-d3d11.cpp +++ b/tools/render-test/render-d3d11.cpp @@ -8,6 +8,9 @@ #include +#ifdef _MSC_VER +#pragma warning(disable: 4996) +#endif #define STB_IMAGE_WRITE_IMPLEMENTATION #include "external/stb/stb_image_write.h" @@ -660,7 +663,7 @@ public: virtual Buffer* createBuffer(BufferDesc const& desc) override { D3D11_BUFFER_DESC dxBufferDesc = { 0 }; - dxBufferDesc.ByteWidth = desc.size; + dxBufferDesc.ByteWidth = (UINT) desc.size; switch( desc.flavor ) { @@ -715,10 +718,10 @@ public: for( UInt ii = 0; ii < inputElementCount; ++ii ) { dxInputElements[ii].SemanticName = inputElements[ii].semanticName; - dxInputElements[ii].SemanticIndex = inputElements[ii].semanticIndex; + dxInputElements[ii].SemanticIndex = (UINT) inputElements[ii].semanticIndex; dxInputElements[ii].Format = mapFormat(inputElements[ii].format); dxInputElements[ii].InputSlot = 0; - dxInputElements[ii].AlignedByteOffset = inputElements[ii].offset; + dxInputElements[ii].AlignedByteOffset = (UINT) inputElements[ii].offset; dxInputElements[ii].InputSlotClass = D3D11_INPUT_PER_VERTEX_DATA; dxInputElements[ii].InstanceDataStepRate = 0; @@ -738,9 +741,11 @@ public: return nullptr; } - hlslCursor+= sprintf(hlslCursor, "%s a%d : %s%d", typeName, ii, + hlslCursor+= sprintf(hlslCursor, "%s a%d : %s%d", + typeName, + (int) ii, inputElements[ii].semanticName, - inputElements[ii].semanticIndex); + (int) inputElements[ii].semanticIndex); } hlslCursor += sprintf(hlslCursor, "\n) : SV_Position { return 0; }"); @@ -752,7 +757,7 @@ public: ID3D11InputLayout* dxInputLayout = nullptr; HRESULT hr = dxDevice->CreateInputLayout( &dxInputElements[0], - inputElementCount, + (UINT) inputElementCount, dxVertexShaderBlob->GetBufferPointer(), dxVertexShaderBlob->GetBufferSize(), &dxInputLayout); @@ -839,13 +844,15 @@ public: for( UInt ii = 0; ii < slotCount; ++ii ) { - dxVertexStrides[ii] = strides[ii]; - dxVertexOffsets[ii] = offsets[ii]; + dxVertexStrides[ii] = (UINT) strides[ii]; + dxVertexOffsets[ii] = (UINT) offsets[ii]; } auto dxVertexBuffers = (ID3D11Buffer* const*) buffers; - dxContext->IASetVertexBuffers(startSlot, slotCount, &dxVertexBuffers[0], &dxVertexStrides[0], &dxVertexOffsets[0]); + dxContext->IASetVertexBuffers( + (UINT) startSlot, + (UINT) slotCount, &dxVertexBuffers[0], &dxVertexStrides[0], &dxVertexOffsets[0]); } virtual void setShaderProgram(ShaderProgram* inProgram) override @@ -866,8 +873,10 @@ public: auto dxConstantBuffers = (ID3D11Buffer* const*) buffers; - dxContext->VSSetConstantBuffers(startSlot, slotCount, &dxConstantBuffers[0]); - dxContext->VSSetConstantBuffers(startSlot, slotCount, &dxConstantBuffers[0]); + dxContext->VSSetConstantBuffers( + (UINT) startSlot, (UINT) slotCount, &dxConstantBuffers[0]); + dxContext->VSSetConstantBuffers( + (UINT) startSlot, (UINT) slotCount, &dxConstantBuffers[0]); } @@ -875,7 +884,7 @@ public: { auto dxContext = dxImmediateContext; - dxContext->Draw(vertexCount, startVertex); + dxContext->Draw((UINT) vertexCount, (UINT) startVertex); } -- cgit v1.2.3