summaryrefslogtreecommitdiff
path: root/src/video_core/swrasterizer
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2017-05-05 21:33:32 -0700
committerGitHub <noreply@github.com>2017-05-05 21:33:32 -0700
commit2a01a03375401f4110a3a80de8ebf9bd48e46bc7 (patch)
tree91c3dd5e60e0d977406b8e39adc1732d09a9d1ce /src/video_core/swrasterizer
parent8bee0161458a082491d611ba4353cda84881b067 (diff)
parent039b2930928c34c011fcc236d7f8c32599077ad0 (diff)
Merge pull request #2686 from wwylele/tex-coord-reg
pica: use correct coordinates for texture 2
Diffstat (limited to 'src/video_core/swrasterizer')
-rw-r--r--src/video_core/swrasterizer/rasterizer.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/video_core/swrasterizer/rasterizer.cpp b/src/video_core/swrasterizer/rasterizer.cpp
index cb1b90a81..20addf0bd 100644
--- a/src/video_core/swrasterizer/rasterizer.cpp
+++ b/src/video_core/swrasterizer/rasterizer.cpp
@@ -276,8 +276,10 @@ static void ProcessTriangleInternal(const Vertex& v0, const Vertex& v1, const Ve
DEBUG_ASSERT(0 != texture.config.address);
- float24 u = uv[i].u();
- float24 v = uv[i].v();
+ int coordinate_i =
+ (i == 2 && regs.texturing.main_config.texture2_use_coord1) ? 1 : i;
+ float24 u = uv[coordinate_i].u();
+ float24 v = uv[coordinate_i].v();
// Only unit 0 respects the texturing type (according to 3DBrew)
// TODO: Refactor so cubemaps and shadowmaps can be handled