diff options
| author | 2017-02-04 13:02:48 -0800 | |
|---|---|---|
| committer | 2017-02-04 13:02:48 -0800 | |
| commit | 97e06b0a0daccd3347ae1bcaf294093b5af32e85 (patch) | |
| tree | 59e1997c90558f58f7368d6974c355e1f20d8f32 /src/video_core/rasterizer.cpp | |
| parent | Merge pull request #2414 from yuriks/texture-decode (diff) | |
| parent | VideoCore: Make PrimitiveAssembler const-correct (diff) | |
| download | yuzu-97e06b0a0daccd3347ae1bcaf294093b5af32e85.tar.gz yuzu-97e06b0a0daccd3347ae1bcaf294093b5af32e85.tar.xz yuzu-97e06b0a0daccd3347ae1bcaf294093b5af32e85.zip | |
Merge pull request #2476 from yuriks/shader-refactor3
Oh No! More shader changes!
Diffstat (limited to 'src/video_core/rasterizer.cpp')
| -rw-r--r-- | src/video_core/rasterizer.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp index c034c12d3..287d732b5 100644 --- a/src/video_core/rasterizer.cpp +++ b/src/video_core/rasterizer.cpp | |||
| @@ -308,8 +308,8 @@ MICROPROFILE_DEFINE(GPU_Rasterization, "GPU", "Rasterization", MP_RGB(50, 50, 24 | |||
| 308 | * Helper function for ProcessTriangle with the "reversed" flag to allow for implementing | 308 | * Helper function for ProcessTriangle with the "reversed" flag to allow for implementing |
| 309 | * culling via recursion. | 309 | * culling via recursion. |
| 310 | */ | 310 | */ |
| 311 | static void ProcessTriangleInternal(const Shader::OutputVertex& v0, const Shader::OutputVertex& v1, | 311 | static void ProcessTriangleInternal(const Vertex& v0, const Vertex& v1, const Vertex& v2, |
| 312 | const Shader::OutputVertex& v2, bool reversed = false) { | 312 | bool reversed = false) { |
| 313 | const auto& regs = g_state.regs; | 313 | const auto& regs = g_state.regs; |
| 314 | MICROPROFILE_SCOPE(GPU_Rasterization); | 314 | MICROPROFILE_SCOPE(GPU_Rasterization); |
| 315 | 315 | ||
| @@ -1277,8 +1277,7 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, const Shader | |||
| 1277 | } | 1277 | } |
| 1278 | } | 1278 | } |
| 1279 | 1279 | ||
| 1280 | void ProcessTriangle(const Shader::OutputVertex& v0, const Shader::OutputVertex& v1, | 1280 | void ProcessTriangle(const Vertex& v0, const Vertex& v1, const Vertex& v2) { |
| 1281 | const Shader::OutputVertex& v2) { | ||
| 1282 | ProcessTriangleInternal(v0, v1, v2); | 1281 | ProcessTriangleInternal(v0, v1, v2); |
| 1283 | } | 1282 | } |
| 1284 | 1283 | ||