diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-11-08 00:03:50 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-11-08 00:08:42 +0100 |
commit | cd663959445c855ab3d0c4c66b8930d30164cc40 (patch) | |
tree | 424f996aae381c1dd6960e0133c3a22b2cd6d653 /src/video_core/renderer_opengl/gl_shader_decompiler.cpp | |
parent | shader_ir/warp: Implement FSWZADD (diff) | |
download | yuzu-cd663959445c855ab3d0c4c66b8930d30164cc40.tar yuzu-cd663959445c855ab3d0c4c66b8930d30164cc40.tar.gz yuzu-cd663959445c855ab3d0c4c66b8930d30164cc40.tar.bz2 yuzu-cd663959445c855ab3d0c4c66b8930d30164cc40.tar.lz yuzu-cd663959445c855ab3d0c4c66b8930d30164cc40.tar.xz yuzu-cd663959445c855ab3d0c4c66b8930d30164cc40.tar.zst yuzu-cd663959445c855ab3d0c4c66b8930d30164cc40.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index 21c137ec5..5d2c38a5e 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -1382,13 +1382,19 @@ private: Expression FSwizzleAdd(Operation operation) { const std::string op_a = VisitOperand(operation, 0).AsFloat(); const std::string op_b = VisitOperand(operation, 1).AsFloat(); - const std::string instr_mask = VisitOperand(operation, 2).AsUint(); + if (!device.HasShaderBallot()) { + LOG_ERROR(Render_OpenGL, "Shader ballot is unavailable but required by the shader"); + return {fmt::format("{} + {}", op_a, op_b), Type::Float}; + } + + const std::string instr_mask = VisitOperand(operation, 2).AsUint(); const std::string mask = code.GenerateTemporary(); - code.AddLine("uint {} = {} >> ((gl_SubGroupInvocationARB & 3) << 1);", mask, instr_mask); + code.AddLine("uint {} = ({} >> ((gl_SubGroupInvocationARB & 3) << 1)) & 3;", mask, + instr_mask); - const std::string modifier_a = fmt::format("fswzadd_modifiers_a[{} & 3]", mask); - const std::string modifier_b = fmt::format("fswzadd_modifiers_b[{} & 3]", mask); + const std::string modifier_a = fmt::format("fswzadd_modifiers_a[{}]", mask); + const std::string modifier_b = fmt::format("fswzadd_modifiers_b[{}]", mask); return {fmt::format("(({} * {}) + ({} * {}))", op_a, modifier_a, op_b, modifier_b), Type::Float}; } @@ -1957,11 +1963,21 @@ private: } Expression ThreadId(Operation operation) { + if (!device.HasShaderBallot()) { + LOG_ERROR(Render_OpenGL, "Shader ballot is unavailable but required by the shader"); + return {"0U", Type::Uint}; + } return {"gl_SubGroupInvocationARB", Type::Uint}; } Expression ShuffleIndexed(Operation operation) { - const std::string value = VisitOperand(operation, 0).AsFloat(); + std::string value = VisitOperand(operation, 0).AsFloat(); + + if (!device.HasShaderBallot()) { + LOG_ERROR(Render_OpenGL, "Shader ballot is unavailable but required by the shader"); + return {std::move(value), Type::Float}; + } + const std::string index = VisitOperand(operation, 1).AsUint(); return {fmt::format("readInvocationARB({}, {})", value, index), Type::Float}; } |