From bae0f21f74b1c63beb95adb80b180f835963f066 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Tue, 21 Dec 2021 18:22:47 -0800 Subject: SW/Tev: Remove Tev::Init --- Source/Core/VideoBackends/Software/Rasterizer.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'Source/Core/VideoBackends/Software/Rasterizer.cpp') diff --git a/Source/Core/VideoBackends/Software/Rasterizer.cpp b/Source/Core/VideoBackends/Software/Rasterizer.cpp index 2a341d8093..e27d1a49b0 100644 --- a/Source/Core/VideoBackends/Software/Rasterizer.cpp +++ b/Source/Core/VideoBackends/Software/Rasterizer.cpp @@ -108,8 +108,6 @@ static std::vector scissors; void Init() { - tev.Init(); - // The other slopes are set each for each primitive drawn, but zfreeze means that the z slope // needs to be set to an (untested) default value. ZSlope = Slope(); -- cgit v1.2.3 From ae0fcd9a9f495bb11820545ae46dbe0827328b6b Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Sun, 26 Dec 2021 13:24:47 -0800 Subject: SW/Tev: Replace Tev::SetRegColor with Tev::SetKonstColors --- Source/Core/VideoBackends/Software/Rasterizer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/VideoBackends/Software/Rasterizer.cpp') diff --git a/Source/Core/VideoBackends/Software/Rasterizer.cpp b/Source/Core/VideoBackends/Software/Rasterizer.cpp index e27d1a49b0..c302203015 100644 --- a/Source/Core/VideoBackends/Software/Rasterizer.cpp +++ b/Source/Core/VideoBackends/Software/Rasterizer.cpp @@ -140,9 +140,9 @@ static inline int iround(float x) return t; } -void SetTevReg(int reg, int comp, s16 color) +void SetTevKonstColors() { - tev.SetRegColor(reg, comp, color); + tev.SetKonstColors(); } static void Draw(s32 x, s32 y, s32 xi, s32 yi) -- cgit v1.2.3 From 4206ac243b1381bc02481ce7a4a69b02663a60ba Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Sun, 26 Dec 2021 16:16:13 -0800 Subject: SW/Rasterizer: Use RAS1_IREF::getTexCoord and getTexMap --- Source/Core/VideoBackends/Software/Rasterizer.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'Source/Core/VideoBackends/Software/Rasterizer.cpp') diff --git a/Source/Core/VideoBackends/Software/Rasterizer.cpp b/Source/Core/VideoBackends/Software/Rasterizer.cpp index c302203015..b27dc14c89 100644 --- a/Source/Core/VideoBackends/Software/Rasterizer.cpp +++ b/Source/Core/VideoBackends/Software/Rasterizer.cpp @@ -286,13 +286,10 @@ static void BuildBlock(s32 blockX, s32 blockY) } } - u32 indref = bpmem.tevindref.hex; for (unsigned int i = 0; i < bpmem.genMode.numindstages; i++) { - u32 texmap = indref & 7; - indref >>= 3; - u32 texcoord = indref & 7; - indref >>= 3; + u32 texmap = bpmem.tevindref.getTexMap(i); + u32 texcoord = bpmem.tevindref.getTexCoord(i); CalculateLOD(&rasterBlock.IndirectLod[i], &rasterBlock.IndirectLinear[i], texmap, texcoord); } -- cgit v1.2.3