mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-08 03:49:09 +01:00
vk/gl_shader_decompiler: Silence assertion on compute
This commit is contained in:
parent
62560f1e63
commit
69c7a01f88
2 changed files with 12 additions and 6 deletions
|
@ -408,8 +408,11 @@ public:
|
|||
explicit GLSLDecompiler(const Device& device, const ShaderIR& ir, const Registry& registry,
|
||||
ShaderType stage, std::string_view identifier, std::string_view suffix)
|
||||
: device{device}, ir{ir}, registry{registry}, stage{stage},
|
||||
identifier{identifier}, suffix{suffix}, header{ir.GetHeader()},
|
||||
transform_feedback{BuildTransformFeedback(registry.GetGraphicsInfo())} {}
|
||||
identifier{identifier}, suffix{suffix}, header{ir.GetHeader()} {
|
||||
if (stage != ShaderType::Compute) {
|
||||
transform_feedback = BuildTransformFeedback(registry.GetGraphicsInfo());
|
||||
}
|
||||
}
|
||||
|
||||
void Decompile() {
|
||||
DeclareHeader();
|
||||
|
@ -2553,7 +2556,7 @@ private:
|
|||
const std::string_view identifier;
|
||||
const std::string_view suffix;
|
||||
const Header header;
|
||||
const std::unordered_map<u8, VaryingTFB> transform_feedback;
|
||||
std::unordered_map<u8, VaryingTFB> transform_feedback;
|
||||
|
||||
ShaderWriter code;
|
||||
|
||||
|
|
|
@ -277,8 +277,11 @@ public:
|
|||
explicit SPIRVDecompiler(const VKDevice& device, const ShaderIR& ir, ShaderType stage,
|
||||
const Registry& registry, const Specialization& specialization)
|
||||
: Module(0x00010300), device{device}, ir{ir}, stage{stage}, header{ir.GetHeader()},
|
||||
registry{registry}, specialization{specialization},
|
||||
transform_feedback{BuildTransformFeedback(registry.GetGraphicsInfo())} {
|
||||
registry{registry}, specialization{specialization} {
|
||||
if (stage != ShaderType::Compute) {
|
||||
transform_feedback = BuildTransformFeedback(registry.GetGraphicsInfo());
|
||||
}
|
||||
|
||||
AddCapability(spv::Capability::Shader);
|
||||
AddCapability(spv::Capability::UniformAndStorageBuffer16BitAccess);
|
||||
AddCapability(spv::Capability::ImageQuery);
|
||||
|
@ -2581,7 +2584,7 @@ private:
|
|||
const Tegra::Shader::Header header;
|
||||
const Registry& registry;
|
||||
const Specialization& specialization;
|
||||
const std::unordered_map<u8, VaryingTFB> transform_feedback;
|
||||
std::unordered_map<u8, VaryingTFB> transform_feedback;
|
||||
|
||||
const Id t_void = Name(TypeVoid(), "void");
|
||||
|
||||
|
|
Loading…
Reference in a new issue