From 17d5fb6d06ba9b9bc2928f07da12386621921e51 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Fri, 7 Jun 2019 20:35:46 -0300 Subject: [PATCH 1/2] kepler_compute: Fix block_dim_x encoding --- src/video_core/engines/kepler_compute.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video_core/engines/kepler_compute.h b/src/video_core/engines/kepler_compute.h index 5250b8d9b..d02709bb2 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; From 528c15051c8c9f24060a7d61b01e103fdc7413ab Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Fri, 7 Jun 2019 20:36:22 -0300 Subject: [PATCH 2/2] kepler_compute: Use std::array for cbuf info --- src/video_core/engines/kepler_compute.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/video_core/engines/kepler_compute.h b/src/video_core/engines/kepler_compute.h index d02709bb2..6a3309a2c 100644 --- a/src/video_core/engines/kepler_compute.h +++ b/src/video_core/engines/kepler_compute.h @@ -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((static_cast(address_high.Value()) << 32) | address_low); } - } const_buffer_config[8]; + }; + std::array const_buffer_config; union { BitField<0, 20, u32> local_pos_alloc;