From eaffcce87c373d6c701f1463859659235023d58c Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sat, 15 Sep 2018 15:11:07 -0700 Subject: Fixed compiler warnings --- Tests/TestApp/src/TestBlendState.cpp | 10 ++++----- Tests/TestApp/src/TestDepthStencilState.cpp | 32 ++++++++++++++--------------- Tests/TestApp/src/TestRasterizerState.cpp | 22 ++++++++++---------- 3 files changed, 32 insertions(+), 32 deletions(-) (limited to 'Tests/TestApp/src') diff --git a/Tests/TestApp/src/TestBlendState.cpp b/Tests/TestApp/src/TestBlendState.cpp index f54df7e..d8ae658 100644 --- a/Tests/TestApp/src/TestBlendState.cpp +++ b/Tests/TestApp/src/TestBlendState.cpp @@ -223,12 +223,12 @@ TestBlendState::TestBlendState( IRenderDevice *pDevice, IDeviceContext *pContext //pScript->GetPipelineStateByName( "TestPSO2", &pPSOFromScript2 ); //assert( pPSOFromScript == pBSFromScript2 ); const auto &PSODesc = pPSOFromScript->GetDesc(); - const auto &BSDesc = PSODesc.GraphicsPipeline.BlendDesc; + const auto &BSDesc2 = PSODesc.GraphicsPipeline.BlendDesc; assert( strcmp(PSODesc.Name, "TestPSO_FromScript") == 0 ); - assert( BSDesc.IndependentBlendEnable == true ); - assert( BSDesc.AlphaToCoverageEnable == false ); - const auto &RT1 = BSDesc.RenderTargets[0]; + assert( BSDesc2.IndependentBlendEnable == true ); + assert( BSDesc2.AlphaToCoverageEnable == false ); + const auto &RT1 = BSDesc2.RenderTargets[0]; assert( RT1.BlendEnable == true); assert( RT1.SrcBlend == BLEND_FACTOR_ZERO); assert( RT1.DestBlend == BLEND_FACTOR_SRC_COLOR); @@ -238,7 +238,7 @@ TestBlendState::TestBlendState( IRenderDevice *pDevice, IDeviceContext *pContext assert( RT1.BlendOpAlpha == BLEND_OPERATION_SUBTRACT); assert( RT1.RenderTargetWriteMask == (COLOR_MASK_GREEN | COLOR_MASK_RED) ); - const auto& RT3 = BSDesc.RenderTargets[2]; + const auto& RT3 = BSDesc2.RenderTargets[2]; assert(RT3.BlendEnable == true); assert(RT3.SrcBlend == BLEND_FACTOR_INV_DEST_ALPHA); assert(RT3.DestBlend == BLEND_FACTOR_INV_DEST_COLOR); diff --git a/Tests/TestApp/src/TestDepthStencilState.cpp b/Tests/TestApp/src/TestDepthStencilState.cpp index 8ad006b..f8fbef1 100644 --- a/Tests/TestApp/src/TestDepthStencilState.cpp +++ b/Tests/TestApp/src/TestDepthStencilState.cpp @@ -134,22 +134,22 @@ TestDepthStencilState::TestDepthStencilState( IRenderDevice *pDevice, IDeviceCon pScript->GetPipelineStateByName( "TestPSO", &pPSOFromScript); //pScript->GetDepthStencilStateByName( "TestDSS2", &pDSStateFromScript2 ); //assert( pDSStateFromScript == pDSStateFromScript2 ); - const auto &DSSDesc = pPSOFromScript->GetDesc().GraphicsPipeline.DepthStencilDesc; - - assert( DSSDesc.DepthEnable == True ); - assert( DSSDesc.DepthWriteEnable == True ); - assert( DSSDesc.DepthFunc == COMPARISON_FUNC_LESS ); - assert( DSSDesc.StencilEnable == True ); - assert( DSSDesc.StencilReadMask == 0xF8 ); - assert( DSSDesc.StencilWriteMask == 0xF1 ); - assert( DSSDesc.FrontFace.StencilFailOp == STENCIL_OP_KEEP ); - assert( DSSDesc.FrontFace.StencilDepthFailOp == STENCIL_OP_ZERO ); - assert( DSSDesc.FrontFace.StencilPassOp == STENCIL_OP_REPLACE ); - assert( DSSDesc.FrontFace.StencilFunc == COMPARISON_FUNC_EQUAL ); - assert( DSSDesc.BackFace.StencilFailOp == STENCIL_OP_INCR_SAT ); - assert( DSSDesc.BackFace.StencilDepthFailOp == STENCIL_OP_DECR_SAT ); - assert( DSSDesc.BackFace.StencilPassOp == STENCIL_OP_INVERT ); - assert( DSSDesc.BackFace.StencilFunc == COMPARISON_FUNC_NOT_EQUAL ); + const auto &DSSDesc2 = pPSOFromScript->GetDesc().GraphicsPipeline.DepthStencilDesc; + + assert( DSSDesc2.DepthEnable == True ); + assert( DSSDesc2.DepthWriteEnable == True ); + assert( DSSDesc2.DepthFunc == COMPARISON_FUNC_LESS ); + assert( DSSDesc2.StencilEnable == True ); + assert( DSSDesc2.StencilReadMask == 0xF8 ); + assert( DSSDesc2.StencilWriteMask == 0xF1 ); + assert( DSSDesc2.FrontFace.StencilFailOp == STENCIL_OP_KEEP ); + assert( DSSDesc2.FrontFace.StencilDepthFailOp == STENCIL_OP_ZERO ); + assert( DSSDesc2.FrontFace.StencilPassOp == STENCIL_OP_REPLACE ); + assert( DSSDesc2.FrontFace.StencilFunc == COMPARISON_FUNC_EQUAL ); + assert( DSSDesc2.BackFace.StencilFailOp == STENCIL_OP_INCR_SAT ); + assert( DSSDesc2.BackFace.StencilDepthFailOp == STENCIL_OP_DECR_SAT ); + assert( DSSDesc2.BackFace.StencilPassOp == STENCIL_OP_INVERT ); + assert( DSSDesc2.BackFace.StencilFunc == COMPARISON_FUNC_NOT_EQUAL ); } { diff --git a/Tests/TestApp/src/TestRasterizerState.cpp b/Tests/TestApp/src/TestRasterizerState.cpp index 8033f6a..ae0f8fc 100644 --- a/Tests/TestApp/src/TestRasterizerState.cpp +++ b/Tests/TestApp/src/TestRasterizerState.cpp @@ -110,17 +110,17 @@ TestRasterizerState::TestRasterizerState( IRenderDevice *pDevice, IDeviceContext //pScript->GetRasterizerStateByName( "TestRS2", &pRSFromScript2 ); const auto &PSODesc = pPSOFromScript->GetDesc(); - const auto &RSDesc = PSODesc.GraphicsPipeline.RasterizerDesc; - - assert( RSDesc.FillMode == FILL_MODE_WIREFRAME ); - assert( RSDesc.CullMode == CULL_MODE_BACK ); - assert( RSDesc.FrontCounterClockwise == True ); - assert( RSDesc.DepthBias == 32 ); - assert( RSDesc.DepthBiasClamp == 63.0 ); - assert( RSDesc.SlopeScaledDepthBias == 31.25 ); - assert( RSDesc.DepthClipEnable == True ); - assert( RSDesc.ScissorEnable == False ); - assert( RSDesc.AntialiasedLineEnable == True ); + const auto &RSDesc2 = PSODesc.GraphicsPipeline.RasterizerDesc; + + assert( RSDesc2.FillMode == FILL_MODE_WIREFRAME ); + assert( RSDesc2.CullMode == CULL_MODE_BACK ); + assert( RSDesc2.FrontCounterClockwise == True ); + assert( RSDesc2.DepthBias == 32 ); + assert( RSDesc2.DepthBiasClamp == 63.0 ); + assert( RSDesc2.SlopeScaledDepthBias == 31.25 ); + assert( RSDesc2.DepthClipEnable == True ); + assert( RSDesc2.ScissorEnable == False ); + assert( RSDesc2.AntialiasedLineEnable == True ); } { -- cgit v1.2.3