summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2018-03-19 22:46:29 +0100
committerSubv <subv2112@gmail.com>2018-03-19 22:46:29 +0100
commit21d9519032ec787cc5fad7aa3f9e7ff2c9453f72 (patch)
treedc08e396bcdf29a20f366d91fd6a7e492c093de4
parentMerge pull request #251 from Subv/tic_tsc (diff)
downloadyuzu-21d9519032ec787cc5fad7aa3f9e7ff2c9453f72.tar
yuzu-21d9519032ec787cc5fad7aa3f9e7ff2c9453f72.tar.gz
yuzu-21d9519032ec787cc5fad7aa3f9e7ff2c9453f72.tar.bz2
yuzu-21d9519032ec787cc5fad7aa3f9e7ff2c9453f72.tar.lz
yuzu-21d9519032ec787cc5fad7aa3f9e7ff2c9453f72.tar.xz
yuzu-21d9519032ec787cc5fad7aa3f9e7ff2c9453f72.tar.zst
yuzu-21d9519032ec787cc5fad7aa3f9e7ff2c9453f72.zip
-rw-r--r--src/video_core/engines/maxwell_3d.h33
1 files changed, 32 insertions, 1 deletions
diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h
index 096679162..f354241e4 100644
--- a/src/video_core/engines/maxwell_3d.h
+++ b/src/video_core/engines/maxwell_3d.h
@@ -31,6 +31,7 @@ public:
struct Regs {
static constexpr size_t NUM_REGS = 0xE36;
+ static constexpr size_t NumRenderTargets = 8;
static constexpr size_t NumCBData = 16;
static constexpr size_t NumVertexArrays = 32;
static constexpr size_t MaxShaderProgram = 6;
@@ -62,7 +63,35 @@ public:
union {
struct {
- INSERT_PADDING_WORDS(0x557);
+ INSERT_PADDING_WORDS(0x200);
+
+ struct {
+ u32 address_high;
+ u32 address_low;
+ u32 horiz;
+ u32 vert;
+ u32 format;
+ u32 block_dimensions;
+ u32 array_mode;
+ u32 layer_stride;
+ u32 base_layer;
+ INSERT_PADDING_WORDS(7);
+
+ GPUVAddr Address() const {
+ return static_cast<GPUVAddr>((static_cast<GPUVAddr>(address_high) << 32) |
+ address_low);
+ }
+ } rt[NumRenderTargets];
+
+ INSERT_PADDING_WORDS(0x207);
+
+ struct {
+ union {
+ BitField<0, 4, u32> count;
+ };
+ } rt_control;
+
+ INSERT_PADDING_WORDS(0xCF);
struct {
u32 tsc_address_high;
@@ -291,6 +320,8 @@ private:
static_assert(offsetof(Maxwell3D::Regs, field_name) == position * 4, \
"Field " #field_name " has invalid position")
+ASSERT_REG_POSITION(rt, 0x200);
+ASSERT_REG_POSITION(rt_control, 0x487);
ASSERT_REG_POSITION(tsc, 0x557);
ASSERT_REG_POSITION(tic, 0x55D);
ASSERT_REG_POSITION(code_address, 0x582);