diff options
| author | 2018-07-03 00:26:45 -0400 | |
|---|---|---|
| committer | 2018-07-03 00:26:45 -0400 | |
| commit | 15e68cdbaac38bbf13cd4eb0d70d1e34b2fd4256 (patch) | |
| tree | 9d072a572c0037a44e1e35aeffc242d3772a383c /src/video_core/engines | |
| parent | Merge pull request #612 from bunnei/fix-cull (diff) | |
| parent | Fix build and address review feedback (diff) | |
| download | yuzu-15e68cdbaac38bbf13cd4eb0d70d1e34b2fd4256.tar.gz yuzu-15e68cdbaac38bbf13cd4eb0d70d1e34b2fd4256.tar.xz yuzu-15e68cdbaac38bbf13cd4eb0d70d1e34b2fd4256.zip | |
Merge pull request #607 from jroweboy/logging
Logging - Customizable backends
Diffstat (limited to 'src/video_core/engines')
| -rw-r--r-- | src/video_core/engines/fermi_2d.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/engines/maxwell_3d.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/engines/maxwell_dma.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/video_core/engines/fermi_2d.cpp b/src/video_core/engines/fermi_2d.cpp index 998b7c843..34053e393 100644 --- a/src/video_core/engines/fermi_2d.cpp +++ b/src/video_core/engines/fermi_2d.cpp | |||
| @@ -26,8 +26,8 @@ void Fermi2D::WriteReg(u32 method, u32 value) { | |||
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | void Fermi2D::HandleSurfaceCopy() { | 28 | void Fermi2D::HandleSurfaceCopy() { |
| 29 | NGLOG_WARNING(HW_GPU, "Requested a surface copy with operation {}", | 29 | LOG_WARNING(HW_GPU, "Requested a surface copy with operation {}", |
| 30 | static_cast<u32>(regs.operation)); | 30 | static_cast<u32>(regs.operation)); |
| 31 | 31 | ||
| 32 | const GPUVAddr source = regs.src.Address(); | 32 | const GPUVAddr source = regs.src.Address(); |
| 33 | const GPUVAddr dest = regs.dst.Address(); | 33 | const GPUVAddr dest = regs.dst.Address(); |
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index 93c43c8cb..9b209a49e 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp | |||
| @@ -207,8 +207,8 @@ void Maxwell3D::ProcessQueryGet() { | |||
| 207 | } | 207 | } |
| 208 | 208 | ||
| 209 | void Maxwell3D::DrawArrays() { | 209 | void Maxwell3D::DrawArrays() { |
| 210 | NGLOG_DEBUG(HW_GPU, "called, topology={}, count={}", | 210 | LOG_DEBUG(HW_GPU, "called, topology={}, count={}", static_cast<u32>(regs.draw.topology.Value()), |
| 211 | static_cast<u32>(regs.draw.topology.Value()), regs.vertex_buffer.count); | 211 | regs.vertex_buffer.count); |
| 212 | ASSERT_MSG(!(regs.index_array.count && regs.vertex_buffer.count), "Both indexed and direct?"); | 212 | ASSERT_MSG(!(regs.index_array.count && regs.vertex_buffer.count), "Both indexed and direct?"); |
| 213 | 213 | ||
| 214 | auto debug_context = Core::System::GetInstance().GetGPUDebugContext(); | 214 | auto debug_context = Core::System::GetInstance().GetGPUDebugContext(); |
diff --git a/src/video_core/engines/maxwell_dma.cpp b/src/video_core/engines/maxwell_dma.cpp index c298f0bfb..6e740713f 100644 --- a/src/video_core/engines/maxwell_dma.cpp +++ b/src/video_core/engines/maxwell_dma.cpp | |||
| @@ -31,7 +31,7 @@ void MaxwellDMA::WriteReg(u32 method, u32 value) { | |||
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | void MaxwellDMA::HandleCopy() { | 33 | void MaxwellDMA::HandleCopy() { |
| 34 | NGLOG_WARNING(HW_GPU, "Requested a DMA copy"); | 34 | LOG_WARNING(HW_GPU, "Requested a DMA copy"); |
| 35 | 35 | ||
| 36 | const GPUVAddr source = regs.src_address.Address(); | 36 | const GPUVAddr source = regs.src_address.Address(); |
| 37 | const GPUVAddr dest = regs.dst_address.Address(); | 37 | const GPUVAddr dest = regs.dst_address.Address(); |