Merge pull request #8414 from bylaws/master

Maxwell3D: Fix 3D semaphore counter type 0 handling
2022-06-03 18:02:10 +07:00 · 2022-06-03 18:02:10 +07:00 · 14db101148
parent 5c0a31e29f ea89cf8639
commit 14db101148
2 changed files with 3 additions and 3 deletions
--- a/src/video_core/engines/maxwell_3d.cpp
+++ b/src/video_core/engines/maxwell_3d.cpp
@ -595,8 +595,8 @@ void Maxwell3D::DrawArrays() {

 std::optional<u64> Maxwell3D::GetQueryResult() {
    switch (regs.query.query_get.select) {
-    case Regs::QuerySelect::Zero:
-        return 0;
+    case Regs::QuerySelect::Payload:
+        return regs.query.query_sequence;
    case Regs::QuerySelect::SamplesPassed:
        // Deferred.
        rasterizer->Query(regs.query.QueryAddress(), QueryType::SamplesPassed,
--- a/src/video_core/engines/maxwell_3d.h
+++ b/src/video_core/engines/maxwell_3d.h
@ -93,7 +93,7 @@ public:
        };

        enum class QuerySelect : u32 {
-            Zero = 0,
+            Payload = 0,
            TimeElapsed = 2,
            TransformFeedbackPrimitivesGenerated = 11,
            PrimitivesGenerated = 18,