summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Fernando Sahmkow2020-02-18 13:19:24 -0400
committerGravatar Fernando Sahmkow2020-04-22 11:36:13 -0400
commita081a7c8558500249f4871f3a1b8c9046cb1b6f1 (patch)
tree1b0ea7a584aa76f48918668c208c1b083c6cb85d /src
parentRasterizer: Disable fence managing in synchronous gpu. (diff)
downloadyuzu-a081a7c8558500249f4871f3a1b8c9046cb1b6f1.tar.gz
yuzu-a081a7c8558500249f4871f3a1b8c9046cb1b6f1.tar.xz
yuzu-a081a7c8558500249f4871f3a1b8c9046cb1b6f1.zip
GPU: Fix rebase errors.
Diffstat (limited to 'src')
-rw-r--r--src/video_core/engines/maxwell_3d.cpp7
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp1
2 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp
index c297bc31b..cff90bc1d 100644
--- a/src/video_core/engines/maxwell_3d.cpp
+++ b/src/video_core/engines/maxwell_3d.cpp
@@ -403,12 +403,11 @@ void Maxwell3D::ProcessQueryGet() {
403 "Units other than CROP are unimplemented"); 403 "Units other than CROP are unimplemented");
404 404
405 switch (regs.query.query_get.operation) { 405 switch (regs.query.query_get.operation) {
406 case Regs::QueryOperation::Release: { 406 case Regs::QueryOperation::Release:
407 const u64 result = regs.query.query_sequence;
408 if (regs.query.query_get.fence == 1) { 407 if (regs.query.query_get.fence == 1) {
409 rasterizer.SignalFence(regs.query.QueryAddress(), static_cast<u32>(result)); 408 rasterizer.SignalFence(regs.query.QueryAddress(), regs.query.query_sequence);
410 } else { 409 } else {
411 StampQueryResult(result, regs.query.query_get.short_query == 0); 410 StampQueryResult(regs.query.query_sequence, regs.query.query_get.short_query == 0);
412 } 411 }
413 break; 412 break;
414 } 413 }
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index ffa0a0429..db7eae065 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -673,6 +673,7 @@ void RasterizerOpenGL::OnCPUWrite(VAddr addr, u64 size) {
673 texture_cache.OnCPUWrite(addr, size); 673 texture_cache.OnCPUWrite(addr, size);
674 shader_cache.InvalidateRegion(addr, size); 674 shader_cache.InvalidateRegion(addr, size);
675 buffer_cache.OnCPUWrite(addr, size); 675 buffer_cache.OnCPUWrite(addr, size);
676 query_cache.InvalidateRegion(addr, size);
676} 677}
677 678
678void RasterizerOpenGL::SyncGuestHost() { 679void RasterizerOpenGL::SyncGuestHost() {