Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-12-02 18:46:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #3269 from raven02/patch-10

Browse Source 
Fragment : Set doTextureAlpha = gstate.isTextureAlphaUsed();
This commit is contained in:
Henrik Rydgård 2013-08-20 06:43:36 -07:00
commit 35894f9f77
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GPU/GLES/FragmentShaderGenerator.cpp
View File

@ -118,7 +118,7 @@ void ComputeFragmentShaderID(FragmentShaderID *id) {
// This isn't really correct, but it's a hack to get doubled blend modes to work more correctly.
bool enableAlphaDoubling = CanDoubleSrcBlendMode();
bool doTextureProjection = gstate.getUVGenMode() == GE_TEXMAP_TEXTURE_MATRIX;
bool doTextureAlpha = (gstate.texfunc & 0x100) != 0;
bool doTextureAlpha = gstate.isTextureAlphaUsed();
// All texfuncs except replace are the same for RGB as for RGBA with full alpha.
if (gstate_c.textureFullAlpha && gstate.getTextureFunction() != GE_TEXFUNC_REPLACE)
@ -165,7 +165,7 @@ void GenerateFragmentShader(char *buffer) {
// This isn't really correct, but it's a hack to get doubled blend modes to work more correctly.
bool enableAlphaDoubling = CanDoubleSrcBlendMode();
bool doTextureProjection = gstate.getUVGenMode() == GE_TEXMAP_TEXTURE_MATRIX;
bool doTextureAlpha = (gstate.texfunc & 0x100) != 0;
bool doTextureAlpha = gstate.isTextureAlphaUsed();
if (gstate_c.textureFullAlpha && gstate.getTextureFunction() != GE_TEXFUNC_REPLACE)
doTextureAlpha = false;

1
GPU/GPUState.h
View File

@ -277,6 +277,7 @@ struct GPUgstate
bool isTextureMapEnabled() const { return textureMapEnable & 1; }
GETexFunc getTextureFunction() const { return static_cast<GETexFunc>(texfunc & 0x7); }
bool isColorDoublingEnabled() const { return (texfunc & 0x10000) != 0; }
bool isTextureAlphaUsed() const { return (texfunc & 0x100) != 0; }
GETextureFormat getTextureFormat() const { return static_cast<GETextureFormat>(texformat & 0xF); }
bool isTextureFormatIndexed() const { return (texformat & 4) != 0; } // GE_TFMT_CLUT4 - GE_TFMT_CLUT32 are 0b1xx.
int getTextureEnvColR() const { return texenvcolor&0xFF; }