ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GSdx-d3d: Rename d3d9 blendtable and variables to d3d11.

This commit is contained in:
lightningterror 2018-12-21 17:52:48 +01:00
parent 6a5bb5df83
commit 7e8360efbc
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/GSdx/Renderers/DX11/GSTextureFX11.cpp
View File

@ -398,9 +398,9 @@ void GSDevice11::SetupOM(OMDepthStencilSelector dssel, OMBlendSelector bsel, uin
{ {
int i = ((bsel.a * 3 + bsel.b) * 3 + bsel.c) * 3 + bsel.d; int i = ((bsel.a * 3 + bsel.b) * 3 + bsel.c) * 3 + bsel.d;
bd.RenderTarget[0].BlendOp = (D3D11_BLEND_OP)m_blendMapD3D9[i].op; bd.RenderTarget[0].BlendOp = (D3D11_BLEND_OP)m_blendMapD3D11[i].op;
bd.RenderTarget[0].SrcBlend = (D3D11_BLEND)m_blendMapD3D9[i].src; bd.RenderTarget[0].SrcBlend = (D3D11_BLEND)m_blendMapD3D11[i].src;
bd.RenderTarget[0].DestBlend = (D3D11_BLEND)m_blendMapD3D9[i].dst; bd.RenderTarget[0].DestBlend = (D3D11_BLEND)m_blendMapD3D11[i].dst;
bd.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD; bd.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
bd.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE; bd.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE;
bd.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO; bd.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO;

2
plugins/GSdx/Renderers/DXCommon/GSDeviceDX.cpp
View File

@ -148,7 +148,7 @@ bool GSDeviceDX::SetFeatureLevel(D3D_FEATURE_LEVEL level, bool compat_mode)
// # (tricky) => 1 * Cd + Cd * F => Use (Cd, F) as factor of color (1, Cd) // # (tricky) => 1 * Cd + Cd * F => Use (Cd, F) as factor of color (1, Cd)
// * (bogus) => C * (1 + F ) + ... => factor is always bigger than 1 (except above case) // * (bogus) => C * (1 + F ) + ... => factor is always bigger than 1 (except above case)
const GSDeviceDX::D3D9Blend GSDeviceDX::m_blendMapD3D9[3*3*3*3] = const GSDeviceDX::D3D11Blend GSDeviceDX::m_blendMapD3D11[3*3*3*3] =
{ {
{0, D3DBLENDOP_ADD , D3DBLEND_ONE , D3DBLEND_ZERO} , // 0000: (Cs - Cs)*As + Cs ==> Cs {0, D3DBLENDOP_ADD , D3DBLEND_ONE , D3DBLEND_ZERO} , // 0000: (Cs - Cs)*As + Cs ==> Cs
{0, D3DBLENDOP_ADD , D3DBLEND_ZERO , D3DBLEND_ONE} , // 0001: (Cs - Cs)*As + Cd ==> Cd {0, D3DBLENDOP_ADD , D3DBLEND_ZERO , D3DBLEND_ONE} , // 0001: (Cs - Cs)*As + Cd ==> Cd

4
plugins/GSdx/Renderers/DXCommon/GSDeviceDX.h
View File

@ -304,8 +304,8 @@ public:
} }
}; };
struct D3D9Blend {int bogus, op, src, dst;}; struct D3D11Blend {int bogus, op, src, dst;};
static const D3D9Blend m_blendMapD3D9[3*3*3*3]; static const D3D11Blend m_blendMapD3D11[3*3*3*3];
#pragma pack(pop) #pragma pack(pop)