GSdx-d3d11: Add support for depth_fmt bit as well as macro for shader.

This commit is contained in:
lightningterror 2018-12-12 18:56:08 +01:00
parent abb1cc5fe7
commit 3a9ff840cf
2 changed files with 9 additions and 6 deletions

View File

@ -209,7 +209,7 @@ void GSDevice11::SetupPS(PSSelector sel, const PSConstantBuffer* cb, PSSamplerSe
if(i == m_ps.end())
{
std::string str[23];
std::string str[24];
str[0] = format("%d", sel.fst);
str[1] = format("%d", sel.wms);
@ -232,8 +232,9 @@ void GSDevice11::SetupPS(PSSelector sel, const PSConstantBuffer* cb, PSSamplerSe
str[18] = format("%d", sel.shuffle);
str[19] = format("%d", sel.read_ba);
str[20] = format("%d", sel.channel);
str[21] = format("%d", sel.fmt >> 2);
str[22] = format("%d", m_upscale_multiplier);
str[21] = format("%d", sel.depth_fmt);
str[22] = format("%d", sel.fmt >> 2);
str[23] = format("%d", m_upscale_multiplier);
D3D_SHADER_MACRO macro[] =
{
@ -258,8 +259,9 @@ void GSDevice11::SetupPS(PSSelector sel, const PSConstantBuffer* cb, PSSamplerSe
{"PS_SHUFFLE", str[18].c_str() },
{"PS_READ_BA", str[19].c_str() },
{"PS_CHANNEL_FETCH", str[20].c_str() },
{"PS_PAL_FMT", str[21].c_str() },
{"PS_SCALE_FACTOR", str[22].c_str() },
{"PS_DEPTH_FMT", str[21].c_str() },
{"PS_PAL_FMT", str[22].c_str() },
{"PS_SCALE_FACTOR", str[23].c_str() },
{NULL, NULL},
};

View File

@ -179,6 +179,7 @@ public:
// Format
uint32 fmt:4;
uint32 dfmt:2;
uint32 depth_fmt:2;
// Alpha extension/Correction
uint32 aem:1;
uint32 fba:1;
@ -213,7 +214,7 @@ public:
uint32 tcoffsethack:1;
uint32 point_sampler:1;
uint32 _free:27;
uint32 _free:25;
};
uint64 key;