summaryrefslogtreecommitdiffstats
path: root/src/shader_recompiler
diff options
context:
space:
mode:
authorameerj <52414509+ameerj@users.noreply.github.com>2021-05-23 05:03:27 +0200
committerameerj <52414509+ameerj@users.noreply.github.com>2021-07-23 03:51:36 +0200
commitac7b0ebcb77f6c99d054e9d10412e669eefa0de6 (patch)
tree322952f22d0c1cac6c4ae6423e73aeb124403498 /src/shader_recompiler
parentglsl: FP function fixes (diff)
downloadyuzu-ac7b0ebcb77f6c99d054e9d10412e669eefa0de6.tar
yuzu-ac7b0ebcb77f6c99d054e9d10412e669eefa0de6.tar.gz
yuzu-ac7b0ebcb77f6c99d054e9d10412e669eefa0de6.tar.bz2
yuzu-ac7b0ebcb77f6c99d054e9d10412e669eefa0de6.tar.lz
yuzu-ac7b0ebcb77f6c99d054e9d10412e669eefa0de6.tar.xz
yuzu-ac7b0ebcb77f6c99d054e9d10412e669eefa0de6.tar.zst
yuzu-ac7b0ebcb77f6c99d054e9d10412e669eefa0de6.zip
Diffstat (limited to 'src/shader_recompiler')
-rw-r--r--src/shader_recompiler/backend/glsl/emit_context.cpp15
-rw-r--r--src/shader_recompiler/backend/glsl/emit_glsl_floating_point.cpp10
2 files changed, 16 insertions, 9 deletions
diff --git a/src/shader_recompiler/backend/glsl/emit_context.cpp b/src/shader_recompiler/backend/glsl/emit_context.cpp
index da379360a..67772c46d 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.cpp
+++ b/src/shader_recompiler/backend/glsl/emit_context.cpp
@@ -48,11 +48,16 @@ void EmitContext::DefineStorageBuffers() {
}
u32 binding{};
for (const auto& desc : info.storage_buffers_descriptors) {
- Add("layout(std430,binding={}) buffer ssbo_{}_u32{{uint ssbo{}_u32[];}};", binding, binding,
- desc.cbuf_index, desc.count);
- // TODO: Track ssbo data type usage
- Add("layout(std430,binding={}) buffer ssbo_{}_u64{{uvec2 ssbo{}_u64[];}};", binding,
- binding, desc.cbuf_index, desc.count);
+ if (True(info.used_storage_buffer_types & IR::Type::U32) ||
+ True(info.used_storage_buffer_types & IR::Type::F32)) {
+ Add("layout(std430,binding={}) buffer ssbo_{}_u32{{uint ssbo{}_u32[];}};", binding,
+ 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;
}
}
diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_floating_point.cpp b/src/shader_recompiler/backend/glsl/emit_glsl_floating_point.cpp
index 2aa9f2cd3..19a3c236d 100644
--- a/src/shader_recompiler/backend/glsl/emit_glsl_floating_point.cpp
+++ b/src/shader_recompiler/backend/glsl/emit_glsl_floating_point.cpp
@@ -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,
[[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,
[[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,
@@ -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 min_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,
[[maybe_unused]] std::string_view value,
[[maybe_unused]] std::string_view min_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,