summaryrefslogtreecommitdiff
path: root/src/video_core/engines
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_core/engines')
-rw-r--r--src/video_core/engines/maxwell_3d.cpp6
-rw-r--r--src/video_core/engines/puller.cpp6
2 files changed, 4 insertions, 8 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp
index 922c399e6..46b9c548a 100644
--- a/src/video_core/engines/maxwell_3d.cpp
+++ b/src/video_core/engines/maxwell_3d.cpp
@@ -596,12 +596,6 @@ void Maxwell3D::ProcessCounterReset() {
596 case Regs::ClearReport::ZPassPixelCount: 596 case Regs::ClearReport::ZPassPixelCount:
597 rasterizer->ResetCounter(VideoCommon::QueryType::ZPassPixelCount64); 597 rasterizer->ResetCounter(VideoCommon::QueryType::ZPassPixelCount64);
598 break; 598 break;
599 case Regs::ClearReport::PrimitivesGenerated:
600 rasterizer->ResetCounter(VideoCommon::QueryType::StreamingByteCount);
601 break;
602 case Regs::ClearReport::VtgPrimitivesOut:
603 rasterizer->ResetCounter(VideoCommon::QueryType::StreamingByteCount);
604 break;
605 default: 599 default:
606 LOG_DEBUG(Render_OpenGL, "Unimplemented counter reset={}", regs.clear_report_value); 600 LOG_DEBUG(Render_OpenGL, "Unimplemented counter reset={}", regs.clear_report_value);
607 break; 601 break;
diff --git a/src/video_core/engines/puller.cpp b/src/video_core/engines/puller.cpp
index 582738234..8dd34c04a 100644
--- a/src/video_core/engines/puller.cpp
+++ b/src/video_core/engines/puller.cpp
@@ -82,7 +82,8 @@ void Puller::ProcessSemaphoreTriggerMethod() {
82 if (op == GpuSemaphoreOperation::WriteLong) { 82 if (op == GpuSemaphoreOperation::WriteLong) {
83 const GPUVAddr sequence_address{regs.semaphore_address.SemaphoreAddress()}; 83 const GPUVAddr sequence_address{regs.semaphore_address.SemaphoreAddress()};
84 const u32 payload = regs.semaphore_sequence; 84 const u32 payload = regs.semaphore_sequence;
85 rasterizer->Query(sequence_address, VideoCommon::QueryType::Payload, VideoCommon::QueryPropertiesFlags::HasTimeout, payload, 0); 85 rasterizer->Query(sequence_address, VideoCommon::QueryType::Payload,
86 VideoCommon::QueryPropertiesFlags::HasTimeout, payload, 0);
86 } else { 87 } else {
87 do { 88 do {
88 const u32 word{memory_manager.Read<u32>(regs.semaphore_address.SemaphoreAddress())}; 89 const u32 word{memory_manager.Read<u32>(regs.semaphore_address.SemaphoreAddress())};
@@ -117,7 +118,8 @@ void Puller::ProcessSemaphoreTriggerMethod() {
117void Puller::ProcessSemaphoreRelease() { 118void Puller::ProcessSemaphoreRelease() {
118 const GPUVAddr sequence_address{regs.semaphore_address.SemaphoreAddress()}; 119 const GPUVAddr sequence_address{regs.semaphore_address.SemaphoreAddress()};
119 const u32 payload = regs.semaphore_release; 120 const u32 payload = regs.semaphore_release;
120 rasterizer->Query(sequence_address, VideoCommon::QueryType::Payload, VideoCommon::QueryPropertiesFlags::IsAFence, payload, 0); 121 rasterizer->Query(sequence_address, VideoCommon::QueryType::Payload,
122 VideoCommon::QueryPropertiesFlags::IsAFence, payload, 0);
121} 123}
122 124
123void Puller::ProcessSemaphoreAcquire() { 125void Puller::ProcessSemaphoreAcquire() {