summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-03-22 00:36:06 +0100
committerGitHub <noreply@github.com>2018-03-22 00:36:06 +0100
commitec5ede68e7f165c5dbb6be8669e226f783241c60 (patch)
tree8326a545bae887e4ad4e2cb86da387d647fea3c3
parentMerge pull request #260 from N00byKing/3535 (diff)
parentGPU: Added vertex attribute format registers. (diff)
downloadyuzu-ec5ede68e7f165c5dbb6be8669e226f783241c60.tar
yuzu-ec5ede68e7f165c5dbb6be8669e226f783241c60.tar.gz
yuzu-ec5ede68e7f165c5dbb6be8669e226f783241c60.tar.bz2
yuzu-ec5ede68e7f165c5dbb6be8669e226f783241c60.tar.lz
yuzu-ec5ede68e7f165c5dbb6be8669e226f783241c60.tar.xz
yuzu-ec5ede68e7f165c5dbb6be8669e226f783241c60.tar.zst
yuzu-ec5ede68e7f165c5dbb6be8669e226f783241c60.zip
-rw-r--r--src/video_core/engines/maxwell_3d.h30
1 files changed, 27 insertions, 3 deletions
diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h
index c2db3154a..aab282b77 100644
--- a/src/video_core/engines/maxwell_3d.h
+++ b/src/video_core/engines/maxwell_3d.h
@@ -34,6 +34,7 @@ public:
static constexpr size_t NumRenderTargets = 8;
static constexpr size_t NumCBData = 16;
static constexpr size_t NumVertexArrays = 32;
+ static constexpr size_t NumVertexAttributes = 32;
static constexpr size_t MaxShaderProgram = 6;
static constexpr size_t MaxShaderStage = 5;
// Maximum number of const buffers per shader stage.
@@ -83,7 +84,14 @@ public:
}
} rt[NumRenderTargets];
- INSERT_PADDING_WORDS(0x178);
+ INSERT_PADDING_WORDS(0xDD);
+
+ struct {
+ u32 first;
+ u32 count;
+ } vertex_buffer;
+
+ INSERT_PADDING_WORDS(0x99);
struct {
u32 address_high;
@@ -98,7 +106,18 @@ public:
}
} zeta;
- INSERT_PADDING_WORDS(0x8A);
+ INSERT_PADDING_WORDS(0x5B);
+
+ union {
+ BitField<0, 5, u32> buffer;
+ BitField<6, 1, u32> constant;
+ BitField<7, 14, u32> offset;
+ BitField<21, 6, u32> size;
+ BitField<27, 3, u32> type;
+ BitField<31, 1, u32> bgra;
+ } vertex_attrib_format[NumVertexAttributes];
+
+ INSERT_PADDING_WORDS(0xF);
struct {
union {
@@ -146,7 +165,10 @@ public:
INSERT_PADDING_WORDS(1);
struct {
u32 vertex_end_gl;
- u32 vertex_begin_gl;
+ union {
+ u32 vertex_begin_gl;
+ BitField<0, 16, u32> topology;
+ };
} draw;
INSERT_PADDING_WORDS(0x139);
struct {
@@ -336,7 +358,9 @@ private:
"Field " #field_name " has invalid position")
ASSERT_REG_POSITION(rt, 0x200);
+ASSERT_REG_POSITION(vertex_buffer, 0x35D);
ASSERT_REG_POSITION(zeta, 0x3F8);
+ASSERT_REG_POSITION(vertex_attrib_format[0], 0x458);
ASSERT_REG_POSITION(rt_control, 0x487);
ASSERT_REG_POSITION(tsc, 0x557);
ASSERT_REG_POSITION(tic, 0x55D);