Merge pull request #8047 from stenzek/d3d-feature-level-10

D3D11: Fix Dolphin crashing on feature level 10.0 devices
This commit is contained in:
Connor McLaughlin
2019-04-28 17:07:37 +10:00
committed by GitHub
4 changed files with 39 additions and 38 deletions

View File

@ -410,10 +410,13 @@ std::string GenerateFormatConversionShader(EFBReinterpretType convtype, u32 samp
{
std::stringstream ss;
EmitSamplerDeclarations(ss, 0, 1, samples > 1);
EmitPixelMainDeclaration(ss, 1, 0, "float4",
GetAPIType() == APIType::D3D ?
"in float4 ipos : SV_Position, in uint isample : SV_SampleIndex, " :
"");
EmitPixelMainDeclaration(
ss, 1, 0, "float4",
GetAPIType() == APIType::D3D ?
(g_ActiveConfig.bSSAA ?
"in float4 ipos : SV_Position, in uint isample : SV_SampleIndex, " :
"in float4 ipos : SV_Position, ") :
"");
ss << "{\n";
ss << " int layer = int(v_tex0.z);\n";
if (GetAPIType() == APIType::D3D)