summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Tony Wasserka2015-01-03 13:49:53 +0100
committerGravatar Tony Wasserka2015-02-18 14:50:28 +0100
commite11fb96408b27e2aa76e29a380fe3a2d15d37d32 (patch)
tree2c72c58a0a147d4e52fda485aca82eeabe93e060 /src
parentPica/TextureEnvironment: Add support for the MAD-like texture combiners and c... (diff)
downloadyuzu-e11fb96408b27e2aa76e29a380fe3a2d15d37d32.tar.gz
yuzu-e11fb96408b27e2aa76e29a380fe3a2d15d37d32.tar.xz
yuzu-e11fb96408b27e2aa76e29a380fe3a2d15d37d32.zip
Pica/TextureEnvironment: Treat texture combiner source 1 as the PrimaryColor.
Not really sure where the difference is, but some applications seem to use this 1:1 the same way...
Diffstat (limited to 'src')
-rw-r--r--src/video_core/pica.h2
-rw-r--r--src/video_core/rasterizer.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/video_core/pica.h b/src/video_core/pica.h
index 23fc6b9ba..24f2c2382 100644
--- a/src/video_core/pica.h
+++ b/src/video_core/pica.h
@@ -224,6 +224,8 @@ struct Regs {
224 struct TevStageConfig { 224 struct TevStageConfig {
225 enum class Source : u32 { 225 enum class Source : u32 {
226 PrimaryColor = 0x0, 226 PrimaryColor = 0x0,
227 PrimaryFragmentColor = 0x1,
228
227 Texture0 = 0x3, 229 Texture0 = 0x3,
228 Texture1 = 0x4, 230 Texture1 = 0x4,
229 Texture2 = 0x5, 231 Texture2 = 0x5,
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp
index eacca82e5..4bf7593ce 100644
--- a/src/video_core/rasterizer.cpp
+++ b/src/video_core/rasterizer.cpp
@@ -303,7 +303,9 @@ static void ProcessTriangleInternal(const VertexShader::OutputVertex& v0,
303 303
304 auto GetSource = [&](Source source) -> Math::Vec4<u8> { 304 auto GetSource = [&](Source source) -> Math::Vec4<u8> {
305 switch (source) { 305 switch (source) {
306 // TODO: What's the difference between these two?
306 case Source::PrimaryColor: 307 case Source::PrimaryColor:
308 case Source::PrimaryFragmentColor:
307 return primary_color; 309 return primary_color;
308 310
309 case Source::Texture0: 311 case Source::Texture0: