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

Merge pull request #8414 from bylaws/master 

Maxwell3D: Fix 3D semaphore counter type 0 handling
This commit is contained in:
Fernando S 2022-06-03 18:02:10 +02:00 committed by GitHub
parent 5c0a31e29f ea89cf8639
commit 14db101148
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/video_core/engines/maxwell_3d.cpp
View File

@ -595,8 +595,8 @@ void Maxwell3D::DrawArrays() {
std::optional<u64> Maxwell3D::GetQueryResult() { std::optional<u64> Maxwell3D::GetQueryResult() {
switch (regs.query.query_get.select) { switch (regs.query.query_get.select) {
case Regs::QuerySelect::Zero: case Regs::QuerySelect::Payload:
return 0; return regs.query.query_sequence;
case Regs::QuerySelect::SamplesPassed: case Regs::QuerySelect::SamplesPassed:
// Deferred. // Deferred.
rasterizer->Query(regs.query.QueryAddress(), QueryType::SamplesPassed, rasterizer->Query(regs.query.QueryAddress(), QueryType::SamplesPassed,

2
src/video_core/engines/maxwell_3d.h
View File

@ -93,7 +93,7 @@ public:
}; };
enum class QuerySelect : u32 { enum class QuerySelect : u32 {
Zero = 0, Payload = 0,
TimeElapsed = 2, TimeElapsed = 2,
TransformFeedbackPrimitivesGenerated = 11, TransformFeedbackPrimitivesGenerated = 11,
PrimitivesGenerated = 18, PrimitivesGenerated = 18,