octo
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl: More FP fixes

This commit is contained in:
ameerj 2021-05-22 23:03:27 -04:00
parent 3064bde415
commit ac7b0ebcb7
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/shader_recompiler/backend/glsl/emit_context.cpp
View File

@ -48,11 +48,16 @@ void EmitContext::DefineStorageBuffers() {
} }
u32 binding{}; u32 binding{};
for (const auto& desc : info.storage_buffers_descriptors) { for (const auto& desc : info.storage_buffers_descriptors) {
Add("layout(std430,binding={}) buffer ssbo_{}_u32{{uint ssbo{}_u32[];}};", binding, binding, if (True(info.used_storage_buffer_types & IR::Type::U32) ||
desc.cbuf_index, desc.count); True(info.used_storage_buffer_types & IR::Type::F32)) {
// TODO: Track ssbo data type usage Add("layout(std430,binding={}) buffer ssbo_{}_u32{{uint ssbo{}_u32[];}};", binding,
Add("layout(std430,binding={}) buffer ssbo_{}_u64{{uvec2 ssbo{}_u64[];}};", binding, binding, desc.cbuf_index, desc.count);
binding, desc.cbuf_index, desc.count); }
if (True(info.used_storage_buffer_types & IR::Type::U32x2) ||
True(info.used_storage_buffer_types & IR::Type::F32x2)) {
Add("layout(std430,binding={}) buffer ssbo_{}_u64{{uvec2 ssbo{}_u64[];}};", binding,
binding, desc.cbuf_index, desc.count);
}
++binding; ++binding;
} }
} }

10
src/shader_recompiler/backend/glsl/emit_glsl_floating_point.cpp
View File

@ -161,12 +161,12 @@ void EmitFPSaturate16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::In
void EmitFPSaturate32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst, void EmitFPSaturate32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
[[maybe_unused]] std::string_view value) { [[maybe_unused]] std::string_view value) {
ctx.AddF32("{}=clamp({},0.0,1.0);", inst, value); ctx.AddF32("{}=min(max({},0.0),1.0);", inst, value);
} }
void EmitFPSaturate64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst, void EmitFPSaturate64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
[[maybe_unused]] std::string_view value) { [[maybe_unused]] std::string_view value) {
ctx.AddF64("{}=clamp({},0.0,1.0);", inst, value); ctx.AddF64("{}=min(max({},0.0),1.0);", inst, value);
} }
void EmitFPClamp16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst, void EmitFPClamp16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
@ -180,14 +180,16 @@ void EmitFPClamp32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst&
[[maybe_unused]] std::string_view value, [[maybe_unused]] std::string_view value,
[[maybe_unused]] std::string_view min_value, [[maybe_unused]] std::string_view min_value,
[[maybe_unused]] std::string_view max_value) { [[maybe_unused]] std::string_view max_value) {
ctx.AddF32("{}=clamp({},float({}),float({}));", inst, value, min_value, max_value); // GLSL's clamp does not produce desirable results
ctx.AddF32("{}=min(max({},float({})),float({}));", inst, value, min_value, max_value);
} }
void EmitFPClamp64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst, void EmitFPClamp64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
[[maybe_unused]] std::string_view value, [[maybe_unused]] std::string_view value,
[[maybe_unused]] std::string_view min_value, [[maybe_unused]] std::string_view min_value,
[[maybe_unused]] std::string_view max_value) { [[maybe_unused]] std::string_view max_value) {
ctx.AddF64("{}=clamp({},double({}),double({}));", inst, value, min_value, max_value); // GLSL's clamp does not produce desirable results
ctx.AddF64("{}=min(max({},double({})),double({}));", inst, value, min_value, max_value);
} }
void EmitFPRoundEven16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst, void EmitFPRoundEven16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,