ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GPU/HW: Don't emit dual-source colour writes on opaque pass 

Fixes warnings triggering in D3D11 debug runtime.
This commit is contained in:
Connor McLaughlin 2020-04-27 00:52:00 +10:00
parent 341b163ca1
commit 746a00743e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/gpu_hw_shadergen.cpp
View File

@ -446,8 +446,10 @@ std::string GPU_HW_ShaderGen::GenerateBatchFragmentShader(GPU_HW::BatchRenderMod
const GPU::TextureMode actual_texture_mode = texture_mode & ~GPU::TextureMode::RawTextureBit; const GPU::TextureMode actual_texture_mode = texture_mode & ~GPU::TextureMode::RawTextureBit;
const bool raw_texture = (texture_mode & GPU::TextureMode::RawTextureBit) == GPU::TextureMode::RawTextureBit; const bool raw_texture = (texture_mode & GPU::TextureMode::RawTextureBit) == GPU::TextureMode::RawTextureBit;
const bool textured = (texture_mode != GPU::TextureMode::Disabled); const bool textured = (texture_mode != GPU::TextureMode::Disabled);
const bool use_dual_source = m_supports_dual_source_blend && const bool use_dual_source =
(transparency != GPU_HW::BatchRenderMode::TransparencyDisabled || m_texture_filering); m_supports_dual_source_blend && ((transparency != GPU_HW::BatchRenderMode::TransparencyDisabled &&
transparency != GPU_HW::BatchRenderMode::OnlyOpaque) ||
m_texture_filering);
std::stringstream ss; std::stringstream ss;
WriteHeader(ss); WriteHeader(ss);
@ -678,9 +680,12 @@ float4 SampleFromVRAM(uint4 texpage, uint2 icoord)
discard; discard;
#endif #endif
#if USE_DUAL_SOURCE #if TRANSPARENCY_ONLY_OPAQUE
// We don't output the second color here because it's not used.
o_col0 = float4(color, oalpha); o_col0 = float4(color, oalpha);
o_col1 = float4(0.0, 0.0, 0.0, 0.0); #elif USE_DUAL_SOURCE
o_col0 = float4(color, oalpha);
o_col1 = float4(0.0, 0.0, 0.0, 1.0 - ialpha);
#else #else
o_col0 = float4(color, 1.0 - ialpha); o_col0 = float4(color, 1.0 - ialpha);
#endif #endif