diff options
| author | 2019-06-08 14:09:02 -0400 | |
|---|---|---|
| committer | 2019-06-08 14:09:02 -0400 | |
| commit | 834e07d639b08d94a8dba0e8a16611c7d422eed1 (patch) | |
| tree | daad137b568008ca939f94009c567bb6328090fb | |
| parent | Merge pull request #2567 from FearlessTobi/patch-1 (diff) | |
| parent | kepler_compute: Use std::array for cbuf info (diff) | |
| download | yuzu-834e07d639b08d94a8dba0e8a16611c7d422eed1.tar.gz yuzu-834e07d639b08d94a8dba0e8a16611c7d422eed1.tar.xz yuzu-834e07d639b08d94a8dba0e8a16611c7d422eed1.zip | |
Merge pull request #2564 from ReinUsesLisp/block-dim-x-fix
kepler_compute: Minor changes
| -rw-r--r-- | src/video_core/engines/kepler_compute.h | 7 |
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: | |||
| 140 | 140 | ||
| 141 | BitField<0, 16, u32> shared_alloc; | 141 | BitField<0, 16, u32> shared_alloc; |
| 142 | 142 | ||
| 143 | BitField<0, 31, u32> block_dim_x; | 143 | BitField<16, 16, u32> block_dim_x; |
| 144 | union { | 144 | union { |
| 145 | BitField<0, 16, u32> block_dim_y; | 145 | BitField<0, 16, u32> block_dim_y; |
| 146 | BitField<16, 16, u32> block_dim_z; | 146 | BitField<16, 16, u32> block_dim_z; |
| @@ -153,7 +153,7 @@ public: | |||
| 153 | 153 | ||
| 154 | INSERT_PADDING_WORDS(0x8); | 154 | INSERT_PADDING_WORDS(0x8); |
| 155 | 155 | ||
| 156 | struct { | 156 | struct ConstBufferConfig { |
| 157 | u32 address_low; | 157 | u32 address_low; |
| 158 | union { | 158 | union { |
| 159 | BitField<0, 8, u32> address_high; | 159 | BitField<0, 8, u32> address_high; |
| @@ -163,7 +163,8 @@ public: | |||
| 163 | return static_cast<GPUVAddr>((static_cast<GPUVAddr>(address_high.Value()) << 32) | | 163 | return static_cast<GPUVAddr>((static_cast<GPUVAddr>(address_high.Value()) << 32) | |
| 164 | address_low); | 164 | address_low); |
| 165 | } | 165 | } |
| 166 | } const_buffer_config[8]; | 166 | }; |
| 167 | std::array<ConstBufferConfig, NumConstBuffers> const_buffer_config; | ||
| 167 | 168 | ||
| 168 | union { | 169 | union { |
| 169 | BitField<0, 20, u32> local_pos_alloc; | 170 | BitField<0, 20, u32> local_pos_alloc; |