yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #2564 from ReinUsesLisp/block-dim-x-fix 

kepler_compute: Minor changes
This commit is contained in:
Zach Hilman 2019-06-08 14:09:02 -04:00 committed by GitHub
parent 9a84f428e1 528c15051c
commit 834e07d639
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/video_core/engines/kepler_compute.h
View File

@ -140,7 +140,7 @@ public:
BitField<0, 16, u32> shared_alloc; BitField<0, 16, u32> shared_alloc;
BitField<0, 31, u32> block_dim_x; BitField<16, 16, u32> block_dim_x;
union { union {
BitField<0, 16, u32> block_dim_y; BitField<0, 16, u32> block_dim_y;
BitField<16, 16, u32> block_dim_z; BitField<16, 16, u32> block_dim_z;
@ -153,7 +153,7 @@ public:
INSERT_PADDING_WORDS(0x8); INSERT_PADDING_WORDS(0x8);
struct { struct ConstBufferConfig {
u32 address_low; u32 address_low;
union { union {
BitField<0, 8, u32> address_high; BitField<0, 8, u32> address_high;
@ -163,7 +163,8 @@ public:
return static_cast<GPUVAddr>((static_cast<GPUVAddr>(address_high.Value()) << 32) | return static_cast<GPUVAddr>((static_cast<GPUVAddr>(address_high.Value()) << 32) |
address_low); address_low);
} }
} const_buffer_config[8]; };
std::array<ConstBufferConfig, NumConstBuffers> const_buffer_config;
union { union {
BitField<0, 20, u32> local_pos_alloc; BitField<0, 20, u32> local_pos_alloc;