summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2021-06-10 07:27:00 +0200
committerameerj <52414509+ameerj@users.noreply.github.com>2021-07-23 03:51:35 +0200
commit5befc0bf872058315c4f81bf58dcd173db2589fd (patch)
tree046584e491c69195c504c7ed27a2a667580975fb
parentbuffer_cache: Fix copy based uniform bindings tracking (diff)
downloadyuzu-5befc0bf872058315c4f81bf58dcd173db2589fd.tar
yuzu-5befc0bf872058315c4f81bf58dcd173db2589fd.tar.gz
yuzu-5befc0bf872058315c4f81bf58dcd173db2589fd.tar.bz2
yuzu-5befc0bf872058315c4f81bf58dcd173db2589fd.tar.lz
yuzu-5befc0bf872058315c4f81bf58dcd173db2589fd.tar.xz
yuzu-5befc0bf872058315c4f81bf58dcd173db2589fd.tar.zst
yuzu-5befc0bf872058315c4f81bf58dcd173db2589fd.zip
-rw-r--r--src/video_core/shader_environment.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/shader_environment.cpp b/src/video_core/shader_environment.cpp
index a7a57a36f..6243cd176 100644
--- a/src/video_core/shader_environment.cpp
+++ b/src/video_core/shader_environment.cpp
@@ -69,7 +69,7 @@ u32 GenericEnvironment::TextureBoundBuffer() const {
}
u32 GenericEnvironment::LocalMemorySize() const {
- return local_memory_size + sph.common3.shader_local_memory_crs_size;
+ return local_memory_size;
}
u32 GenericEnvironment::SharedMemorySize() const {
@@ -233,7 +233,7 @@ GraphicsEnvironment::GraphicsEnvironment(Tegra::Engines::Maxwell3D& maxwell3d_,
}
const u64 local_size{sph.LocalMemorySize()};
ASSERT(local_size <= std::numeric_limits<u32>::max());
- local_memory_size = static_cast<u32>(local_size);
+ local_memory_size = static_cast<u32>(local_size) + sph.common3.shader_local_memory_crs_size;
texture_bound = maxwell3d->regs.tex_cb_index;
}
@@ -261,7 +261,7 @@ ComputeEnvironment::ComputeEnvironment(Tegra::Engines::KeplerCompute& kepler_com
&kepler_compute_} {
const auto& qmd{kepler_compute->launch_description};
stage = Shader::Stage::Compute;
- local_memory_size = qmd.local_pos_alloc;
+ local_memory_size = qmd.local_pos_alloc + qmd.local_crs_alloc;
texture_bound = kepler_compute->regs.tex_cb_index;
shared_memory_size = qmd.shared_alloc;
workgroup_size = {qmd.block_dim_x, qmd.block_dim_y, qmd.block_dim_z};