From 65daec8b75dafb96296c6066db9c1d696948e7fe Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Fri, 25 Jun 2021 16:34:40 -0400
Subject: [PATCH] glsl: Fix shared and local memory declarations
account for the fact that program.*memory_size is in units of bytes.
---
src/shader_recompiler/backend/glsl/emit_glsl.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/shader_recompiler/backend/glsl/emit_glsl.cpp b/src/shader_recompiler/backend/glsl/emit_glsl.cpp
index 46d72963d..ffdc6dbba 100644
--- a/src/shader_recompiler/backend/glsl/emit_glsl.cpp
+++ b/src/shader_recompiler/backend/glsl/emit_glsl.cpp
@@ -5,7 +5,7 @@
#include <ranges>
#include <string>
-#include "common/alignment.h"
+#include "common/div_ceil.h"
#include "common/settings.h"
#include "shader_recompiler/backend/glsl/emit_context.h"
#include "shader_recompiler/backend/glsl/emit_glsl.h"
@@ -219,11 +219,11 @@ std::string EmitGLSL(const Profile& profile, const RuntimeInfo& runtime_info, IR
ctx.header.insert(0, version);
if (program.shared_memory_size > 0) {
ctx.header +=
- fmt::format("shared uint smem[{}];", Common::AlignUp(program.shared_memory_size, 4));
+ fmt::format("shared uint smem[{}];", Common::DivCeil(program.shared_memory_size, 4U));
}
ctx.header += "void main(){\n";
if (program.local_memory_size > 0) {
- ctx.header += fmt::format("uint lmem[{}];", Common::AlignUp(program.local_memory_size, 4));
+ ctx.header += fmt::format("uint lmem[{}];", Common::DivCeil(program.local_memory_size, 4U));
}
DefineVariables(ctx, ctx.header);
if (ctx.uses_cc_carry) {