diff options
Diffstat (limited to 'src/video_core/engines')
| -rw-r--r-- | src/video_core/engines/fermi_2d.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/engines/maxwell_3d.cpp | 11 | ||||
| -rw-r--r-- | src/video_core/engines/shader_bytecode.h | 6 |
3 files changed, 8 insertions, 12 deletions
diff --git a/src/video_core/engines/fermi_2d.cpp b/src/video_core/engines/fermi_2d.cpp index 9409c4075..4293d676c 100644 --- a/src/video_core/engines/fermi_2d.cpp +++ b/src/video_core/engines/fermi_2d.cpp | |||
| @@ -48,8 +48,7 @@ static std::pair<u32, u32> DelimitLine(u32 src_1, u32 src_2, u32 dst_1, u32 dst_ | |||
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | void Fermi2D::HandleSurfaceCopy() { | 50 | void Fermi2D::HandleSurfaceCopy() { |
| 51 | LOG_DEBUG(HW_GPU, "Requested a surface copy with operation {}", | 51 | LOG_DEBUG(HW_GPU, "Requested a surface copy with operation {}", regs.operation); |
| 52 | static_cast<u32>(regs.operation)); | ||
| 53 | 52 | ||
| 54 | // TODO(Subv): Only raw copies are implemented. | 53 | // TODO(Subv): Only raw copies are implemented. |
| 55 | ASSERT(regs.operation == Operation::SrcCopy); | 54 | ASSERT(regs.operation == Operation::SrcCopy); |
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp index 6287df633..761962ed0 100644 --- a/src/video_core/engines/maxwell_3d.cpp +++ b/src/video_core/engines/maxwell_3d.cpp | |||
| @@ -359,7 +359,7 @@ void Maxwell3D::CallMethodFromMME(u32 method, u32 method_argument) { | |||
| 359 | } | 359 | } |
| 360 | 360 | ||
| 361 | void Maxwell3D::FlushMMEInlineDraw() { | 361 | void Maxwell3D::FlushMMEInlineDraw() { |
| 362 | LOG_TRACE(HW_GPU, "called, topology={}, count={}", static_cast<u32>(regs.draw.topology.Value()), | 362 | LOG_TRACE(HW_GPU, "called, topology={}, count={}", regs.draw.topology.Value(), |
| 363 | regs.vertex_buffer.count); | 363 | regs.vertex_buffer.count); |
| 364 | ASSERT_MSG(!(regs.index_array.count && regs.vertex_buffer.count), "Both indexed and direct?"); | 364 | ASSERT_MSG(!(regs.index_array.count && regs.vertex_buffer.count), "Both indexed and direct?"); |
| 365 | ASSERT(mme_draw.instance_count == mme_draw.gl_end_count); | 365 | ASSERT(mme_draw.instance_count == mme_draw.gl_end_count); |
| @@ -504,8 +504,7 @@ void Maxwell3D::ProcessCounterReset() { | |||
| 504 | rasterizer->ResetCounter(QueryType::SamplesPassed); | 504 | rasterizer->ResetCounter(QueryType::SamplesPassed); |
| 505 | break; | 505 | break; |
| 506 | default: | 506 | default: |
| 507 | LOG_DEBUG(Render_OpenGL, "Unimplemented counter reset={}", | 507 | LOG_DEBUG(Render_OpenGL, "Unimplemented counter reset={}", regs.counter_reset); |
| 508 | static_cast<int>(regs.counter_reset)); | ||
| 509 | break; | 508 | break; |
| 510 | } | 509 | } |
| 511 | } | 510 | } |
| @@ -520,7 +519,7 @@ void Maxwell3D::ProcessSyncPoint() { | |||
| 520 | } | 519 | } |
| 521 | 520 | ||
| 522 | void Maxwell3D::DrawArrays() { | 521 | void Maxwell3D::DrawArrays() { |
| 523 | LOG_TRACE(HW_GPU, "called, topology={}, count={}", static_cast<u32>(regs.draw.topology.Value()), | 522 | LOG_TRACE(HW_GPU, "called, topology={}, count={}", regs.draw.topology.Value(), |
| 524 | regs.vertex_buffer.count); | 523 | regs.vertex_buffer.count); |
| 525 | ASSERT_MSG(!(regs.index_array.count && regs.vertex_buffer.count), "Both indexed and direct?"); | 524 | ASSERT_MSG(!(regs.index_array.count && regs.vertex_buffer.count), "Both indexed and direct?"); |
| 526 | 525 | ||
| @@ -558,12 +557,12 @@ std::optional<u64> Maxwell3D::GetQueryResult() { | |||
| 558 | return 0; | 557 | return 0; |
| 559 | case Regs::QuerySelect::SamplesPassed: | 558 | case Regs::QuerySelect::SamplesPassed: |
| 560 | // Deferred. | 559 | // Deferred. |
| 561 | rasterizer->Query(regs.query.QueryAddress(), VideoCore::QueryType::SamplesPassed, | 560 | rasterizer->Query(regs.query.QueryAddress(), QueryType::SamplesPassed, |
| 562 | system.GPU().GetTicks()); | 561 | system.GPU().GetTicks()); |
| 563 | return std::nullopt; | 562 | return std::nullopt; |
| 564 | default: | 563 | default: |
| 565 | LOG_DEBUG(HW_GPU, "Unimplemented query select type {}", | 564 | LOG_DEBUG(HW_GPU, "Unimplemented query select type {}", |
| 566 | static_cast<u32>(regs.query.query_get.select.Value())); | 565 | regs.query.query_get.select.Value()); |
| 567 | return 1; | 566 | return 1; |
| 568 | } | 567 | } |
| 569 | } | 568 | } |
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index 37d17efdc..8b45f1b62 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h | |||
| @@ -1437,8 +1437,7 @@ union Instruction { | |||
| 1437 | return TextureType::TextureCube; | 1437 | return TextureType::TextureCube; |
| 1438 | } | 1438 | } |
| 1439 | 1439 | ||
| 1440 | LOG_CRITICAL(HW_GPU, "Unhandled texture_info: {}", | 1440 | LOG_CRITICAL(HW_GPU, "Unhandled texture_info: {}", texture_info.Value()); |
| 1441 | static_cast<u32>(texture_info.Value())); | ||
| 1442 | UNREACHABLE(); | 1441 | UNREACHABLE(); |
| 1443 | return TextureType::Texture1D; | 1442 | return TextureType::Texture1D; |
| 1444 | } | 1443 | } |
| @@ -1533,8 +1532,7 @@ union Instruction { | |||
| 1533 | return TextureType::Texture3D; | 1532 | return TextureType::Texture3D; |
| 1534 | } | 1533 | } |
| 1535 | 1534 | ||
| 1536 | LOG_CRITICAL(HW_GPU, "Unhandled texture_info: {}", | 1535 | LOG_CRITICAL(HW_GPU, "Unhandled texture_info: {}", texture_info.Value()); |
| 1537 | static_cast<u32>(texture_info.Value())); | ||
| 1538 | UNREACHABLE(); | 1536 | UNREACHABLE(); |
| 1539 | return TextureType::Texture1D; | 1537 | return TextureType::Texture1D; |
| 1540 | } | 1538 | } |