From cff495550e8d9558f37a108316c4f4da9c1c0a42 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sun, 4 Feb 2018 21:03:54 -1000 Subject: [PATCH] Windows compile fix --- lib/graphicsdev/D3D11.cpp | 2 +- lib/graphicsdev/D3D12.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/graphicsdev/D3D11.cpp b/lib/graphicsdev/D3D11.cpp index 57b425c..67a5ec8 100644 --- a/lib/graphicsdev/D3D11.cpp +++ b/lib/graphicsdev/D3D11.cpp @@ -637,7 +637,7 @@ class D3D11ShaderPipeline : public GraphicsDataNode blDesc.RenderTarget[0].SrcBlend = BLEND_FACTOR_TABLE[int(srcFac)]; blDesc.RenderTarget[0].DestBlend = BLEND_FACTOR_TABLE[int(dstFac)]; blDesc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD; - if (m_overwriteAlpha) + if (overwriteAlpha) { blDesc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE; blDesc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO; diff --git a/lib/graphicsdev/D3D12.cpp b/lib/graphicsdev/D3D12.cpp index dd9b3ef..53402ec 100644 --- a/lib/graphicsdev/D3D12.cpp +++ b/lib/graphicsdev/D3D12.cpp @@ -716,7 +716,7 @@ class D3D12ShaderPipeline : public GraphicsDataNode const boo::ObjToken& vtxFmt, BlendFactor srcFac, BlendFactor dstFac, Primitive prim, ZTest depthTest, bool depthWrite, bool colorWrite, - bool alphaWrite, CullMode culling) + bool alphaWrite, bool overwriteAlpha, CullMode culling) : GraphicsDataNode(parent), m_vtxFmt(vtxFmt), m_vert(std::move(vert)), m_pixel(std::move(pixel)), m_topology(PRIMITIVE_TABLE[int(prim)]) @@ -769,7 +769,7 @@ class D3D12ShaderPipeline : public GraphicsDataNode desc.BlendState.RenderTarget[0].SrcBlend = BLEND_FACTOR_TABLE[int(srcFac)]; desc.BlendState.RenderTarget[0].DestBlend = BLEND_FACTOR_TABLE[int(dstFac)]; desc.BlendState.RenderTarget[0].BlendOp = D3D12_BLEND_OP_ADD; - if (m_overwriteAlpha) + if (overwriteAlpha) { desc.BlendState.RenderTarget[0].SrcBlendAlpha = D3D12_BLEND_ONE; desc.BlendState.RenderTarget[0].DestBlendAlpha = D3D12_BLEND_ZERO;