Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

GPU: Cleanup some gstate accesses.

Browse Source
This commit is contained in:
Unknown W. Brackets 2017-05-20 13:02:27 -07:00
parent 402eb143f7
commit 34fe95192f
3 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GPU/Common/TextureCacheCommon.cpp
View File

@ -141,13 +141,13 @@ static int TexLog2(float delta) {
void TextureCacheCommon::GetSamplingParams(int &minFilt, int &magFilt, bool &sClamp, bool &tClamp, float &lodBias, u8 maxLevel, u32 addr, bool &autoMip) {
minFilt = gstate.texfilter & 0x7;
magFilt = (gstate.texfilter >> 8) & 1;
magFilt = gstate.isMagnifyFilteringEnabled();
sClamp = gstate.isTexCoordClampedS();
tClamp = gstate.isTexCoordClampedT();
GETexLevelMode mipMode = gstate.getTexLevelMode();
autoMip = mipMode == GE_TEXLEVEL_MODE_AUTO;
lodBias = (float)(int)(s8)((gstate.texlevel >> 16) & 0xFF) * (1.0f / 16.0f);
lodBias = (float)gstate.getTexLevelOffset16() * (1.0f / 16.0f);
if (mipMode == GE_TEXLEVEL_MODE_SLOPE) {
lodBias += 1.0f + TexLog2(gstate.getTextureLodSlope()) * (1.0f / 256.0f);
}

5
GPU/GPUState.h
View File

@ -279,6 +279,7 @@ struct GPUgstate {
int getTextureHeight(int level) const { return 1 << ((texsize[level] >> 8) & 0xf);}
u16 getTextureDimension(int level) const { return texsize[level] & 0xf0f;}
GETexLevelMode getTexLevelMode() const { return static_cast<GETexLevelMode>(texlevel & 0x3); }
int getTexLevelOffset16() const { return (int)(s8)((texlevel >> 16) & 0xFF); }
bool isTextureMapEnabled() const { return textureMapEnable & 1; }
GETexFunc getTextureFunction() const { return static_cast<GETexFunc>(texfunc & 0x7); }
bool isColorDoublingEnabled() const { return (texfunc & 0x10000) != 0; }
@ -303,6 +304,10 @@ struct GPUgstate {
bool isClutIndexSimple() const { return (clutformat & ~3) == 0xC500FF00; } // Meaning, no special mask, shift, or start pos.
bool isTextureSwizzled() const { return texmode & 1; }
bool isClutSharedForMipmaps() const { return (texmode & 0x100) == 0; }
bool isMipmapEnabled() const { return (texfilter & 4) != 0; }
bool isMipmapFilteringEnabled() const { return (texfilter & 2) != 0; }
bool isMinifyFilteringEnabled() const { return (texfilter & 1) != 0; }
bool isMagnifyFilteringEnabled() const { return (texfilter >> 8) & 1; }
int getTextureMaxLevel() const { return (texmode >> 16) & 0x7; }
float getTextureLodSlope() const { return getFloat24(texlodslope); }

45
GPU/Software/Rasterizer.cpp
View File

@ -1196,7 +1196,7 @@ static inline Vec4<int> SampleLinear(int texlevel, int u[4], int v[4], int frac_
#endif
}
static inline void ApplyTexturing(Vec4<int> &prim_color, float s, float t, int texlevel, int frac_texlevel, int filt, u8 *texptr[], int texbufw[]) {
static inline void ApplyTexturing(Vec4<int> &prim_color, float s, float t, int texlevel, int frac_texlevel, bool bilinear, u8 *texptr[], int texbufw[]) {
int u[8] = {0}, v[8] = {0}; // 1.23.8 fixed point
int frac_u[2], frac_v[2];
@ -1207,7 +1207,6 @@ static inline void ApplyTexturing(Vec4<int> &prim_color, float s, float t, int t
const u8 *tptr1 = texptr[texlevel + 1];
int bufw1 = texbufw[texlevel + 1];
bool bilinear = filt != 0;
if (!bilinear) {
// Nearest filtering only. Round texcoords.
GetTexelCoordinates(texlevel, s, t, u[0], v[0]);
@ -1252,7 +1251,7 @@ static int TexLog2(float delta) {
return useful - 127 * 256;
}
static inline void CalculateSamplingParams(const float ds, const float dt, const int maxTexLevel, int &level, int &levelFrac, int &filt) {
static inline void CalculateSamplingParams(const float ds, const float dt, const int maxTexLevel, int &level, int &levelFrac, bool &filt) {
const int width = gstate.getTextureWidth(0);
const int height = gstate.getTextureHeight(0);
@ -1274,13 +1273,11 @@ static inline void CalculateSamplingParams(const float ds, const float dt, const
}
// Add in the bias (used in all modes), expanding to 8 bits of fraction.
detail += (int)(s8)((gstate.texlevel >> 16) & 0xFF) << 4;
int minFilt = (gstate.texfilter >> 0) & 1;
int mipFilt = (gstate.texfilter >> 1) & 1;
int magFilt = (gstate.texfilter >> 8) & 1;
detail += gstate.getTexLevelOffset16() << 4;
if (detail > 0 && maxTexLevel > 0) {
bool mipFilt = gstate.isMipmapFilteringEnabled();
int level8 = std::min(detail, maxTexLevel * 256);
if (!mipFilt) {
// Round up at 1.5.
@ -1294,11 +1291,11 @@ static inline void CalculateSamplingParams(const float ds, const float dt, const
}
if (g_Config.iTexFiltering == 3) {
filt = 1;
filt = true;
} else if (g_Config.iTexFiltering == 2) {
filt = 0;
filt = false;
} else {
filt = detail > 0 ? minFilt : magFilt;
filt = detail > 0 ? gstate.isMinifyFilteringEnabled() : gstate.isMagnifyFilteringEnabled();
}
}
@ -1308,11 +1305,11 @@ static inline void ApplyTexturing(Vec4<int> *prim_color, const Vec4<float> &s, c
int level;
int levelFrac;
int filt;
CalculateSamplingParams(ds, dt, maxTexLevel, level, levelFrac, filt);
bool bilinear;
CalculateSamplingParams(ds, dt, maxTexLevel, level, levelFrac, bilinear);
for (int i = 0; i < 4; ++i) {
ApplyTexturing(prim_color[i], s[i], t[i], level, levelFrac, filt, texptr, texbufw);
ApplyTexturing(prim_color[i], s[i], t[i], level, levelFrac, bilinear, texptr, texbufw);
}
}
@ -1406,7 +1403,7 @@ void DrawTriangleSlice(
int maxTexLevel = gstate.getTextureMaxLevel();
u8 *texptr[8] = {NULL};
if ((gstate.texfilter & 4) == 0) {
if (!gstate.isMipmapEnabled()) {
// No mipmapping enabled
maxTexLevel = 0;
}
@ -1614,7 +1611,7 @@ void DrawPoint(const VertexData &v0)
int maxTexLevel = gstate.getTextureMaxLevel();
u8 *texptr[8] = {NULL};
if ((gstate.texfilter & 4) == 0) {
if (!gstate.isMipmapEnabled()) {
// No mipmapping enabled
maxTexLevel = 0;
}
@ -1643,9 +1640,9 @@ void DrawPoint(const VertexData &v0)
int texLevel;
int texLevelFrac;
int filt;
CalculateSamplingParams(0.0f, 0.0f, maxTexLevel, texLevel, texLevelFrac, filt);
ApplyTexturing(prim_color, s, t, texLevel, texLevelFrac, filt, texptr, texbufw);
bool bilinear;
CalculateSamplingParams(0.0f, 0.0f, maxTexLevel, texLevel, texLevelFrac, bilinear);
ApplyTexturing(prim_color, s, t, texLevel, texLevelFrac, bilinear, texptr, texbufw);
}
if (!clearMode)
@ -1697,7 +1694,7 @@ void DrawLine(const VertexData &v0, const VertexData &v1)
int maxTexLevel = gstate.getTextureMaxLevel();
u8 *texptr[8] = {NULL};
if ((gstate.texfilter & 4) == 0) {
if (!gstate.isMipmapEnabled()) {
// No mipmapping enabled
maxTexLevel = 0;
}
@ -1762,8 +1759,8 @@ void DrawLine(const VertexData &v0, const VertexData &v1)
int texLevel;
int texLevelFrac;
int texFilt;
CalculateSamplingParams(ds, dt, maxTexLevel, texLevel, texLevelFrac, texFilt);
bool texBilinear;
CalculateSamplingParams(ds, dt, maxTexLevel, texLevel, texLevelFrac, texBilinear);
if (gstate.isAntiAliasEnabled()) {
// TODO: This is a niave and wrong implementation.
@ -1772,10 +1769,10 @@ void DrawLine(const VertexData &v0, const VertexData &v1)
s = ((float)p0.x + xinc / 32.0f) / 512.0f;
t = ((float)p0.y + yinc / 32.0f) / 512.0f;
texFilt = 1;
texBilinear = true;
}
ApplyTexturing(prim_color, s, t, texLevel, texLevelFrac, texFilt, texptr, texbufw);
ApplyTexturing(prim_color, s, t, texLevel, texLevelFrac, texBilinear, texptr, texbufw);
}
if (!clearMode)