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

GPU: Fix rebase errors.

This commit is contained in:
Fernando Sahmkow 2020-02-18 13:19:24 -04:00
parent e84eb64e51
commit a081a7c855
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -403,12 +403,11 @@ void Maxwell3D::ProcessQueryGet() {
"Units other than CROP are unimplemented"); "Units other than CROP are unimplemented");
switch (regs.query.query_get.operation) { switch (regs.query.query_get.operation) {
case Regs::QueryOperation::Release: { case Regs::QueryOperation::Release:
const u64 result = regs.query.query_sequence;
if (regs.query.query_get.fence == 1) { if (regs.query.query_get.fence == 1) {
rasterizer.SignalFence(regs.query.QueryAddress(), static_cast<u32>(result)); rasterizer.SignalFence(regs.query.QueryAddress(), regs.query.query_sequence);
} else { } else {
StampQueryResult(result, regs.query.query_get.short_query == 0); StampQueryResult(regs.query.query_sequence, regs.query.query_get.short_query == 0);
} }
break; break;
} }

1
src/video_core/renderer_opengl/gl_rasterizer.cpp
View File

@ -673,6 +673,7 @@ void RasterizerOpenGL::OnCPUWrite(VAddr addr, u64 size) {
texture_cache.OnCPUWrite(addr, size); texture_cache.OnCPUWrite(addr, size);
shader_cache.InvalidateRegion(addr, size); shader_cache.InvalidateRegion(addr, size);
buffer_cache.OnCPUWrite(addr, size); buffer_cache.OnCPUWrite(addr, size);
query_cache.InvalidateRegion(addr, size);
} }
void RasterizerOpenGL::SyncGuestHost() { void RasterizerOpenGL::SyncGuestHost() {