summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Hilman <DarkLordZach@users.noreply.github.com>2019-06-08 20:09:02 +0200
committerGitHub <noreply@github.com>2019-06-08 20:09:02 +0200
commit834e07d639b08d94a8dba0e8a16611c7d422eed1 (patch)
treedaad137b568008ca939f94009c567bb6328090fb
parentMerge pull request #2567 from FearlessTobi/patch-1 (diff)
parentkepler_compute: Use std::array for cbuf info (diff)
downloadyuzu-834e07d639b08d94a8dba0e8a16611c7d422eed1.tar
yuzu-834e07d639b08d94a8dba0e8a16611c7d422eed1.tar.gz
yuzu-834e07d639b08d94a8dba0e8a16611c7d422eed1.tar.bz2
yuzu-834e07d639b08d94a8dba0e8a16611c7d422eed1.tar.lz
yuzu-834e07d639b08d94a8dba0e8a16611c7d422eed1.tar.xz
yuzu-834e07d639b08d94a8dba0e8a16611c7d422eed1.tar.zst
yuzu-834e07d639b08d94a8dba0e8a16611c7d422eed1.zip
-rw-r--r--src/video_core/engines/kepler_compute.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/engines/kepler_compute.h b/src/video_core/engines/kepler_compute.h
index 5250b8d9b..6a3309a2c 100644
--- a/src/video_core/engines/kepler_compute.h
+++ b/src/video_core/engines/kepler_compute.h
@@ -140,7 +140,7 @@ public:
BitField<0, 16, u32> shared_alloc;
- BitField<0, 31, u32> block_dim_x;
+ BitField<16, 16, u32> block_dim_x;
union {
BitField<0, 16, u32> block_dim_y;
BitField<16, 16, u32> block_dim_z;
@@ -153,7 +153,7 @@ public:
INSERT_PADDING_WORDS(0x8);
- struct {
+ struct ConstBufferConfig {
u32 address_low;
union {
BitField<0, 8, u32> address_high;
@@ -163,7 +163,8 @@ public:
return static_cast<GPUVAddr>((static_cast<GPUVAddr>(address_high.Value()) << 32) |
address_low);
}
- } const_buffer_config[8];
+ };
+ std::array<ConstBufferConfig, NumConstBuffers> const_buffer_config;
union {
BitField<0, 20, u32> local_pos_alloc;