diff options
author | Subv <subv2112@gmail.com> | 2018-02-12 03:34:20 +0100 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2018-02-12 04:42:48 +0100 |
commit | e01a8f218707b6f3ed0f111c432440b07ea5b6ff (patch) | |
tree | f5a95dc16a129a5c1a8a4d1309dfbbc3e4ccdb3f /src/video_core | |
parent | nvdrv: Make the GPU memory manager available to nvhost-gpu. (diff) | |
download | yuzu-e01a8f218707b6f3ed0f111c432440b07ea5b6ff.tar yuzu-e01a8f218707b6f3ed0f111c432440b07ea5b6ff.tar.gz yuzu-e01a8f218707b6f3ed0f111c432440b07ea5b6ff.tar.bz2 yuzu-e01a8f218707b6f3ed0f111c432440b07ea5b6ff.tar.lz yuzu-e01a8f218707b6f3ed0f111c432440b07ea5b6ff.tar.xz yuzu-e01a8f218707b6f3ed0f111c432440b07ea5b6ff.tar.zst yuzu-e01a8f218707b6f3ed0f111c432440b07ea5b6ff.zip |
Diffstat (limited to 'src/video_core')
-rw-r--r-- | src/video_core/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/video_core/command_processor.cpp | 130 | ||||
-rw-r--r-- | src/video_core/command_processor.h | 43 | ||||
-rw-r--r-- | src/video_core/engines/fermi_2d.cpp | 15 | ||||
-rw-r--r-- | src/video_core/engines/fermi_2d.h | 18 | ||||
-rw-r--r-- | src/video_core/engines/maxwell_3d.cpp | 15 | ||||
-rw-r--r-- | src/video_core/engines/maxwell_3d.h | 18 | ||||
-rw-r--r-- | src/video_core/engines/maxwell_compute.cpp | 15 | ||||
-rw-r--r-- | src/video_core/engines/maxwell_compute.h | 18 |
9 files changed, 280 insertions, 0 deletions
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index 69f2b4afd..70728d2f6 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -1,4 +1,12 @@ add_library(video_core STATIC + command_processor.cpp + command_processor.h + engines/fermi_2d.cpp + engines/fermi_2d.h + engines/maxwell_3d.cpp + engines/maxwell_3d.h + engines/maxwell_compute.cpp + engines/maxwell_compute.h renderer_base.cpp renderer_base.h renderer_opengl/gl_resource_manager.h diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp new file mode 100644 index 000000000..e1df875e7 --- /dev/null +++ b/src/video_core/command_processor.cpp @@ -0,0 +1,130 @@ +// Copyright 2018 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include <array> +#include <cstddef> +#include <memory> +#include <utility> +#include "common/assert.h" +#include "common/logging/log.h" +#include "common/microprofile.h" +#include "common/vector_math.h" +#include "core/memory.h" +#include "core/tracer/recorder.h" +#include "video_core/command_processor.h" +#include "video_core/engines/fermi_2d.h" +#include "video_core/engines/maxwell_3d.h" +#include "video_core/engines/maxwell_compute.h" +#include "video_core/renderer_base.h" +#include "video_core/video_core.h" + +namespace Tegra { + +namespace CommandProcessor { + +enum class BufferMethods { + BindObject = 0, + CountBufferMethods = 0x100, +}; + +enum class EngineID { + FERMI_TWOD_A = 0x902D, // 2D Engine + MAXWELL_B = 0xB197, // 3D Engine + MAXWELL_COMPUTE_B = 0xB1C0, + KEPLER_INLINE_TO_MEMORY_B = 0xA140, + MAXWELL_DMA_COPY_A = 0xB0B5, +}; + +// Mapping of subchannels to their bound engine ids. +static std::unordered_map<u32, EngineID> bound_engines; + +static void WriteReg(u32 method, u32 subchannel, u32 value) { + LOG_WARNING(HW_GPU, "Processing method %08X on subchannel %u value %08X", method, subchannel, + value); + + if (method == static_cast<u32>(BufferMethods::BindObject)) { + // Bind the current subchannel to the desired engine id. + LOG_DEBUG(HW_GPU, "Binding subchannel %u to engine %u", subchannel, value); + ASSERT(bound_engines.find(subchannel) == bound_engines.end()); + bound_engines[subchannel] = static_cast<EngineID>(value); + return; + } + + if (method < static_cast<u32>(BufferMethods::CountBufferMethods)) { + // TODO(Subv): Research and implement these methods. + LOG_ERROR(HW_GPU, "Special buffer methods other than Bind are not implemented"); + return; + } + + ASSERT(bound_engines.find(subchannel) != bound_engines.end()); + + const EngineID engine = bound_engines[subchannel]; + + switch (engine) { + case EngineID::FERMI_TWOD_A: + Engines::Fermi2D::WriteReg(method, value); + break; + case EngineID::MAXWELL_B: + Engines::Maxwell3D::WriteReg(method, value); + break; + case EngineID::MAXWELL_COMPUTE_B: + Engines::MaxwellCompute::WriteReg(method, value); + break; + default: + UNIMPLEMENTED(); + } +} + +void ProcessCommandList(VAddr address, u32 size) { + VAddr current_addr = address; + while (current_addr < address + size * sizeof(CommandHeader)) { + const CommandHeader header = {Memory::Read32(current_addr)}; + current_addr += sizeof(u32); + + switch (header.mode.Value()) { + case SubmissionMode::IncreasingOld: + case SubmissionMode::Increasing: { + // Increase the method value with each argument. + for (unsigned i = 0; i < header.arg_count; ++i) { + WriteReg(header.method + i, header.subchannel, Memory::Read32(current_addr)); + current_addr += sizeof(u32); + } + break; + } + case SubmissionMode::NonIncreasingOld: + case SubmissionMode::NonIncreasing: { + // Use the same method value for all arguments. + for (unsigned i = 0; i < header.arg_count; ++i) { + WriteReg(header.method, header.subchannel, Memory::Read32(current_addr)); + current_addr += sizeof(u32); + } + break; + } + case SubmissionMode::IncreaseOnce: { + ASSERT(header.arg_count.Value() >= 1); + // Use the original method for the first argument and then the next method for all other + // arguments. + WriteReg(header.method, header.subchannel, Memory::Read32(current_addr)); + current_addr += sizeof(u32); + // Use the same method value for all arguments. + for (unsigned i = 1; i < header.arg_count; ++i) { + WriteReg(header.method + 1, header.subchannel, Memory::Read32(current_addr)); + current_addr += sizeof(u32); + } + break; + } + case SubmissionMode::Inline: { + // The register value is stored in the bits 16-28 as an immediate + WriteReg(header.method, header.subchannel, header.inline_data); + break; + } + default: + UNIMPLEMENTED(); + } + } +} + +} // namespace CommandProcessor + +} // namespace Tegra diff --git a/src/video_core/command_processor.h b/src/video_core/command_processor.h new file mode 100644 index 000000000..90e64629e --- /dev/null +++ b/src/video_core/command_processor.h @@ -0,0 +1,43 @@ +// Copyright 2018 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include <type_traits> +#include "common/bit_field.h" +#include "common/common_types.h" + +namespace Tegra { + +namespace CommandProcessor { + +enum class SubmissionMode : u32 { + IncreasingOld = 0, + Increasing = 1, + NonIncreasingOld = 2, + NonIncreasing = 3, + Inline = 4, + IncreaseOnce = 5 +}; + +union CommandHeader { + u32 hex; + + BitField<0, 13, u32> method; + BitField<13, 3, u32> subchannel; + + BitField<16, 13, u32> arg_count; + BitField<16, 13, u32> inline_data; + + BitField<29, 3, SubmissionMode> mode; +}; +static_assert(std::is_standard_layout<CommandHeader>::value == true, + "CommandHeader does not use standard layout"); +static_assert(sizeof(CommandHeader) == sizeof(u32), "CommandHeader has incorrect size!"); + +void ProcessCommandList(VAddr address, u32 size); + +} // namespace CommandProcessor + +} // namespace Tegra diff --git a/src/video_core/engines/fermi_2d.cpp b/src/video_core/engines/fermi_2d.cpp new file mode 100644 index 000000000..3d62c321f --- /dev/null +++ b/src/video_core/engines/fermi_2d.cpp @@ -0,0 +1,15 @@ +// Copyright 2018 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "video_core/engines/fermi_2d.h" + +namespace Tegra { +namespace Engines { +namespace Fermi2D { + +void WriteReg(u32 method, u32 value) {} + +} // namespace Fermi2D +} // namespace Engines +} // namespace Tegra diff --git a/src/video_core/engines/fermi_2d.h b/src/video_core/engines/fermi_2d.h new file mode 100644 index 000000000..6f3f5dfbc --- /dev/null +++ b/src/video_core/engines/fermi_2d.h @@ -0,0 +1,18 @@ +// Copyright 2018 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include "common/common_types.h" + +namespace Tegra { +namespace Engines { +namespace Fermi2D { + +void WriteReg(u32 method, u32 value); + +} // namespace Fermi2D + +} // namespace Engines +} // namespace Tegra diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp new file mode 100644 index 000000000..c2697c960 --- /dev/null +++ b/src/video_core/engines/maxwell_3d.cpp @@ -0,0 +1,15 @@ +// Copyright 2018 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "video_core/engines/maxwell_3d.h" + +namespace Tegra { +namespace Engines { +namespace Maxwell3D { + +void WriteReg(u32 method, u32 value) {} + +} // namespace Maxwell3D +} // namespace Engines +} // namespace Tegra diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h new file mode 100644 index 000000000..6957fb721 --- /dev/null +++ b/src/video_core/engines/maxwell_3d.h @@ -0,0 +1,18 @@ +// Copyright 2018 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include "common/common_types.h" + +namespace Tegra { +namespace Engines { +namespace Maxwell3D { + +void WriteReg(u32 method, u32 value); + +} // namespace Maxwell3D + +} // namespace Engines +} // namespace Tegra diff --git a/src/video_core/engines/maxwell_compute.cpp b/src/video_core/engines/maxwell_compute.cpp new file mode 100644 index 000000000..c2134d63b --- /dev/null +++ b/src/video_core/engines/maxwell_compute.cpp @@ -0,0 +1,15 @@ +// Copyright 2018 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#include "video_core/engines/maxwell_compute.h" + +namespace Tegra { +namespace Engines { +namespace MaxwellCompute { + +void WriteReg(u32 method, u32 value) {} + +} // namespace MaxwellCompute +} // namespace Engines +} // namespace Tegra diff --git a/src/video_core/engines/maxwell_compute.h b/src/video_core/engines/maxwell_compute.h new file mode 100644 index 000000000..dc9a13593 --- /dev/null +++ b/src/video_core/engines/maxwell_compute.h @@ -0,0 +1,18 @@ +// Copyright 2018 yuzu Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#pragma once + +#include "common/common_types.h" + +namespace Tegra { +namespace Engines { +namespace MaxwellCompute { + +void WriteReg(u32 method, u32 value); + +} // namespace MaxwellCompute + +} // namespace Engines +} // namespace Tegra |