summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorameerj <52414509+ameerj@users.noreply.github.com>2021-05-21 07:12:58 +0200
committerameerj <52414509+ameerj@users.noreply.github.com>2021-07-23 03:51:35 +0200
commitfaf4cd72c556421966782cece604b64fbafa5714 (patch)
treecb279ca5a0b2fa96b4a6de5262b05c9cf3374f83 /src
parentglsl: Fix "reg" allocing (diff)
downloadyuzu-faf4cd72c556421966782cece604b64fbafa5714.tar
yuzu-faf4cd72c556421966782cece604b64fbafa5714.tar.gz
yuzu-faf4cd72c556421966782cece604b64fbafa5714.tar.bz2
yuzu-faf4cd72c556421966782cece604b64fbafa5714.tar.lz
yuzu-faf4cd72c556421966782cece604b64fbafa5714.tar.xz
yuzu-faf4cd72c556421966782cece604b64fbafa5714.tar.zst
yuzu-faf4cd72c556421966782cece604b64fbafa5714.zip
Diffstat (limited to 'src')
-rw-r--r--src/shader_recompiler/backend/glsl/emit_context.cpp4
-rw-r--r--src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/shader_recompiler/backend/glsl/emit_context.cpp b/src/shader_recompiler/backend/glsl/emit_context.cpp
index b0e46cc07..8eea6344f 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.cpp
+++ b/src/shader_recompiler/backend/glsl/emit_context.cpp
@@ -29,8 +29,8 @@ void EmitContext::DefineConstantBuffers() {
}
u32 binding{};
for (const auto& desc : info.constant_buffer_descriptors) {
- Add("layout(std140,binding={}) uniform cbuf_{}{{uint cbuf{}[];}};", binding, binding,
- desc.index, desc.count);
+ Add("layout(std140,binding={}) uniform cbuf_{}{{vec4 cbuf{}[{}];}};", binding, binding,
+ desc.index, 4 * 1024);
++binding;
}
}
diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp b/src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp
index e45dfa42e..73f0faf35 100644
--- a/src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp
+++ b/src/shader_recompiler/backend/glsl/emit_glsl_context_get_set.cpp
@@ -32,7 +32,9 @@ void EmitGetCbufS16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] const IR
void EmitGetCbufU32(EmitContext& ctx, IR::Inst* inst, const IR::Value& binding,
const IR::Value& offset) {
- ctx.Add("uint {}=cbuf{}[{}];", *inst, binding.U32(), offset.U32());
+ const auto u32_offset{offset.U32()};
+ ctx.Add("uint {}=floatBitsToUint(cbuf{}[{}][{}]);", *inst, binding.U32(), u32_offset / 16,
+ (u32_offset / 4) % 4);
}
void EmitGetCbufF32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] const IR::Value& binding,