starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-15 02:44:41 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

dep/reshadefx: Work around inability to discard in function in DXC

Browse Source 
Need to fix this in SPIRV-Cross instead.
This commit is contained in:
Stenzek
2025-10-27 22:55:16 +10:00
parent fcde8c7765
commit a038c88d24
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dep/reshadefx/include/effect_codegen.hpp
View File

@@ -400,5 +400,5 @@ namespace reshadefx
/// <param name="uniforms_to_spec_constants">Whether to convert uniform variables to specialization constants.</param>
/// <param name="enable_16bit_types">Use real 16-bit types for the minimum precision types "min16int", "min16uint" and "min16float".</param>
/// <param name="flip_vert_y">Insert code to flip the Y component of the output position in vertex shaders.</param>
codegen *create_codegen_spirv(bool vulkan_semantics, bool debug_info, bool uniforms_to_spec_constants, bool enable_16bit_types = false, bool flip_vert_y = false);
codegen *create_codegen_spirv(bool vulkan_semantics, bool debug_info, bool uniforms_to_spec_constants, bool enable_16bit_types = false, bool flip_vert_y = false, bool discard_is_demote = false);
}

24
dep/reshadefx/src/effect_codegen_spirv.cpp
View File

@@ -138,12 +138,13 @@ class codegen_spirv final : public codegen
static_assert(sizeof(id) == sizeof(spv::Id), "unexpected SPIR-V id type size");
public:
codegen_spirv(bool vulkan_semantics, bool debug_info, bool uniforms_to_spec_constants, bool enable_16bit_types, bool flip_vert_y) :
codegen_spirv(bool vulkan_semantics, bool debug_info, bool uniforms_to_spec_constants, bool enable_16bit_types, bool flip_vert_y, bool discard_is_demote) :
_debug_info(debug_info),
_vulkan_semantics(vulkan_semantics),
_uniforms_to_spec_constants(uniforms_to_spec_constants),
_enable_16bit_types(enable_16bit_types),
_flip_vert_y(flip_vert_y)
_flip_vert_y(flip_vert_y),
_discard_is_demote(discard_is_demote)
{
_glsl_ext = make_id();
}
@@ -185,6 +186,7 @@ private:
bool _uniforms_to_spec_constants = false;
bool _enable_16bit_types = false;
bool _flip_vert_y = false;
bool _discard_is_demote = false;
spirv_basic_block _entries;
spirv_basic_block _execution_modes;
@@ -2519,7 +2521,19 @@ private:
if (!is_in_block())
return 0;
add_instruction_without_result(spv::OpKill);
// DXC chokes when discarding inside a function. Return a null value and use demote instead, since that's
// what the HLSL discard instruction compiles to anyway.
if (!_discard_is_demote || _current_function_blocks->return_type.is_void())
{
add_instruction_without_result(spv::OpKill);
}
else
{
add_instruction_without_result(spv::OpDemoteToHelperInvocation);
const id return_id = emit_constant(_current_function_blocks->return_type, constant{}, false);
add_instruction_without_result(spv::OpReturnValue).add(return_id);
}
return set_block(0);
}
@@ -2601,7 +2615,7 @@ private:
}
};
codegen *reshadefx::create_codegen_spirv(bool vulkan_semantics, bool debug_info, bool uniforms_to_spec_constants, bool enable_16bit_types, bool flip_vert_y)
codegen *reshadefx::create_codegen_spirv(bool vulkan_semantics, bool debug_info, bool uniforms_to_spec_constants, bool enable_16bit_types, bool flip_vert_y, bool discard_is_demote)
{
return new codegen_spirv(vulkan_semantics, debug_info, uniforms_to_spec_constants, enable_16bit_types, flip_vert_y);
return new codegen_spirv(vulkan_semantics, debug_info, uniforms_to_spec_constants, enable_16bit_types, flip_vert_y, discard_is_demote);
}

2
src/util/postprocessing_shader_fx.cpp
View File

@@ -90,7 +90,7 @@ static std::tuple<std::unique_ptr<reshadefx::codegen>, GPUShaderLanguage> Create
if (rapi == RenderAPI::D3D12 && rapi_version >= 1200)
{
return std::make_tuple(std::unique_ptr<reshadefx::codegen>(reshadefx::create_codegen_spirv(
true, debug_info, uniforms_to_spec_constants, false, false)),
true, debug_info, uniforms_to_spec_constants, false, false, true)),
GPUShaderLanguage::SPV);
}
else