summaryrefslogtreecommitdiff
path: root/src/video_core/gpu.h
diff options
context:
space:
mode:
authorGravatar bunnei2019-07-25 12:34:36 -0400
committerGravatar GitHub2019-07-25 12:34:36 -0400
commit31e8a61527df805529a9c0bbda735be7cb9e38c9 (patch)
tree5edfff9af910daa29753b224c7f68013eb05f61b /src/video_core/gpu.h
parentMerge pull request #2704 from FernandoS27/conditional (diff)
parentShader_Ir: Change Debug Asserts for Log Warnings (diff)
downloadyuzu-31e8a61527df805529a9c0bbda735be7cb9e38c9.tar.gz
yuzu-31e8a61527df805529a9c0bbda735be7cb9e38c9.tar.xz
yuzu-31e8a61527df805529a9c0bbda735be7cb9e38c9.zip
Merge pull request #2743 from FernandoS27/surpress-assert
Downgrade and suppress a series of GPU asserts and debug messages.
Diffstat (limited to 'src/video_core/gpu.h')
-rw-r--r--src/video_core/gpu.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h
index 0ace0ff4f..0055e5326 100644
--- a/src/video_core/gpu.h
+++ b/src/video_core/gpu.h
@@ -200,7 +200,12 @@ public:
200 200
201 u32 semaphore_acquire; 201 u32 semaphore_acquire;
202 u32 semaphore_release; 202 u32 semaphore_release;
203 INSERT_PADDING_WORDS(0xE4); 203 u32 fence_value;
204 union {
205 BitField<4, 4, u32> operation;
206 BitField<8, 8, u32> id;
207 } fence_action;
208 INSERT_PADDING_WORDS(0xE2);
204 209
205 // Puller state 210 // Puller state
206 u32 acquire_mode; 211 u32 acquire_mode;
@@ -280,6 +285,8 @@ ASSERT_REG_POSITION(semaphore_trigger, 0x7);
280ASSERT_REG_POSITION(reference_count, 0x14); 285ASSERT_REG_POSITION(reference_count, 0x14);
281ASSERT_REG_POSITION(semaphore_acquire, 0x1A); 286ASSERT_REG_POSITION(semaphore_acquire, 0x1A);
282ASSERT_REG_POSITION(semaphore_release, 0x1B); 287ASSERT_REG_POSITION(semaphore_release, 0x1B);
288ASSERT_REG_POSITION(fence_value, 0x1C);
289ASSERT_REG_POSITION(fence_action, 0x1D);
283 290
284ASSERT_REG_POSITION(acquire_mode, 0x100); 291ASSERT_REG_POSITION(acquire_mode, 0x100);
285ASSERT_REG_POSITION(acquire_source, 0x101); 292ASSERT_REG_POSITION(acquire_source, 0x101);