The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 08:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct indirect stage ref typos

Browse Source 
YAGCD uses BI0/BC0/BI1/BC1/BI2/BC2/BI3/BC3, so I'm pretty sure the BI2/BC3/BI4/BC4 names are a typo that just was propagated.
This commit is contained in:
Pokechu22 2021-04-10 15:17:42 -07:00
parent a6f6211dde
commit 072304404c
2 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/VideoCommon/BPMemory.h
View File

@ -600,13 +600,13 @@ struct fmt::formatter<TEXSCALE>
union RAS1_IREF union RAS1_IREF
{ {
BitField<0, 3, u32> bi0; // Indirect tex stage 0 ntexmap BitField<0, 3, u32> bi0; // Indirect tex stage 0 ntexmap
BitField<3, 3, u32> bc0; // Indirect tex stage 0 ntexmap BitField<3, 3, u32> bc0; // Indirect tex stage 0 ntexcoord
BitField<6, 3, u32> bi1; BitField<6, 3, u32> bi1;
BitField<9, 3, u32> bc1; BitField<9, 3, u32> bc1;
BitField<12, 3, u32> bi2; BitField<12, 3, u32> bi2;
BitField<15, 3, u32> bc3; // Typo? BitField<15, 3, u32> bc2;
BitField<18, 3, u32> bi4; BitField<18, 3, u32> bi3;
BitField<21, 3, u32> bc4; BitField<21, 3, u32> bc3;
u32 hex; u32 hex;
u32 getTexCoord(int i) const { return (hex >> (6 * i + 3)) & 7; } u32 getTexCoord(int i) const { return (hex >> (6 * i + 3)) & 7; }
@ -625,8 +625,8 @@ struct fmt::formatter<RAS1_IREF>
"Stage 1 ntexmap: {}\nStage 1 ntexcoord: {}\n" "Stage 1 ntexmap: {}\nStage 1 ntexcoord: {}\n"
"Stage 2 ntexmap: {}\nStage 2 ntexcoord: {}\n" "Stage 2 ntexmap: {}\nStage 2 ntexcoord: {}\n"
"Stage 3 ntexmap: {}\nStage 3 ntexcoord: {}", "Stage 3 ntexmap: {}\nStage 3 ntexcoord: {}",
indref.bi0, indref.bc0, indref.bi1, indref.bc1, indref.bi2, indref.bc3, indref.bi0, indref.bc0, indref.bi1, indref.bc1, indref.bi2, indref.bc2,
indref.bi4, indref.bc4); indref.bi3, indref.bc3);
} }
}; };

32
Source/Core/VideoCommon/PixelShaderGen.h
View File

@ -66,9 +66,9 @@ struct pixel_shader_uid_data
u32 tevindref_bi1 : 3; u32 tevindref_bi1 : 3;
u32 tevindref_bc1 : 3; u32 tevindref_bc1 : 3;
u32 tevindref_bi2 : 3; u32 tevindref_bi2 : 3;
u32 tevindref_bc2 : 3;
u32 tevindref_bi3 : 3;
u32 tevindref_bc3 : 3; u32 tevindref_bc3 : 3;
u32 tevindref_bi4 : 3;
u32 tevindref_bc4 : 3;
void SetTevindrefValues(int index, u32 texcoord, u32 texmap) void SetTevindrefValues(int index, u32 texcoord, u32 texmap)
{ {
@ -84,55 +84,39 @@ struct pixel_shader_uid_data
} }
else if (index == 2) else if (index == 2)
{ {
tevindref_bc3 = texcoord; tevindref_bc2 = texcoord;
tevindref_bi2 = texmap; tevindref_bi2 = texmap;
} }
else if (index == 3) else if (index == 3)
{ {
tevindref_bc4 = texcoord; tevindref_bc3 = texcoord;
tevindref_bi4 = texmap; tevindref_bi3 = texmap;
} }
} }
u32 GetTevindirefCoord(int index) const u32 GetTevindirefCoord(int index) const
{ {
if (index == 0) if (index == 0)
{
return tevindref_bc0; return tevindref_bc0;
}
else if (index == 1) else if (index == 1)
{
return tevindref_bc1; return tevindref_bc1;
}
else if (index == 2) else if (index == 2)
{ return tevindref_bc2;
return tevindref_bc3;
}
else if (index == 3) else if (index == 3)
{ return tevindref_bc3;
return tevindref_bc4;
}
return 0; return 0;
} }
u32 GetTevindirefMap(int index) const u32 GetTevindirefMap(int index) const
{ {
if (index == 0) if (index == 0)
{
return tevindref_bi0; return tevindref_bi0;
}
else if (index == 1) else if (index == 1)
{
return tevindref_bi1; return tevindref_bi1;
}
else if (index == 2) else if (index == 2)
{
return tevindref_bi2; return tevindref_bi2;
}
else if (index == 3) else if (index == 3)
{ return tevindref_bi3;
return tevindref_bi4;
}
return 0; return 0;
} }