Fixes to Const Buffer Accessor and Formatting

1 files changed, 8 insertions, 4 deletions

diff --git a/src/video_core/const_buffer_accessor.cpp b/src/video_core/const_buffer_accessor.cpp
index c89ab91c7..0e613e1f9 100644
--- a/src/video_core/const_buffer_accessor.cpp
+++ b/src/video_core/const_buffer_accessor.cpp
@@ -14,21 +14,25 @@ namespace Tegra {
 
 u32 ConstBufferAccessor::access32(Tegra::Engines::Maxwell3D::Regs::ShaderStage stage,
                                   u64 const_buffer, u64 offset) {
-    auto& memory_manager = Core::System::GetInstance().GPU().MemoryManager();
+    auto& gpu = Core::System::GetInstance().GPU();
+    auto& memory_manager = gpu.MemoryManager();
+    auto& maxwell3d = gpu.Maxwell3D();
     const auto& shader_stage = maxwell3d.state.shader_stages[static_cast<std::size_t>(stage)];
     const auto& buffer = shader_stage.const_buffers[const_buffer];
     u32 result;
-    std::memcpy(&result, memory_manager.GetPointer(buffer.address + offset * 4), sizeof(u32));
+    std::memcpy(&result, memory_manager.GetPointer(buffer.address + offset), sizeof(u32));
     return result;
 }
 
 u64 ConstBufferAccessor::access64(Tegra::Engines::Maxwell3D::Regs::ShaderStage stage,
                                   u64 const_buffer, u64 offset) {
-    auto& memory_manager = Core::System::GetInstance().GPU().MemoryManager();
+    auto& gpu = Core::System::GetInstance().GPU();
+    auto& memory_manager = gpu.MemoryManager();
+    auto& maxwell3d = gpu.Maxwell3D();
     const auto& shader_stage = maxwell3d.state.shader_stages[static_cast<std::size_t>(stage)];
     const auto& buffer = shader_stage.const_buffers[const_buffer];
     u64 result;
-    std::memcpy(&result, memory_manager.GetPointer(buffer.address + offset * 4), sizeof(u64));
+    std::memcpy(&result, memory_manager.GetPointer(buffer.address + offset), sizeof(u64));
     return result;
 }