From a77e9a27b0e82192cd17eea255e6b04893ccafa7 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Thu, 28 Mar 2019 14:54:52 -0400 Subject: Simplify ConstBufferAccessor --- src/video_core/const_buffer_accessor.h | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'src/video_core/const_buffer_accessor.h') diff --git a/src/video_core/const_buffer_accessor.h b/src/video_core/const_buffer_accessor.h index 37d1ca767..01524673b 100644 --- a/src/video_core/const_buffer_accessor.h +++ b/src/video_core/const_buffer_accessor.h @@ -1,18 +1,28 @@ #pragma once +#include + #include "common/common_types.h" +#include "core/core.h" #include "video_core/engines/maxwell_3d.h" +#include "video_core/gpu.h" +#include "video_core/memory_manager.h" namespace Tegra { -class ConstBufferAccessor { -public: - ConstBufferAccessor() {} - ~ConstBufferAccessor() = default; - - u32 access32(Tegra::Engines::Maxwell3D::Regs::ShaderStage stage, u64 const_buffer, u64 offset); +namespace ConstBufferAccessor { - u64 access64(Tegra::Engines::Maxwell3D::Regs::ShaderStage stage, u64 const_buffer, u64 offset); -}; +template +T access(Tegra::Engines::Maxwell3D::Regs::ShaderStage stage, u64 const_buffer, u64 offset) { + 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(stage)]; + const auto& buffer = shader_stage.const_buffers[const_buffer]; + T result; + std::memcpy(&result, memory_manager.GetPointer(buffer.address + offset), sizeof(T)); + return result; +} +} // namespace ConstBufferAccessor } // namespace Tegra -- cgit v1.2.3