Permalink
Browse files

OpenGL Renderer: Fix instances where the transparent fragments of A3I…

…5 and A5I3 textures would fail to render correctly.

Fixes issue #19.
  • Loading branch information...
1 parent 5285131 commit 7b1350127d226902b52ec2bbdc9fcb217c2e6b29 @rogerman rogerman committed Dec 22, 2016
Showing with 89 additions and 21 deletions.
  1. +56 −10 desmume/src/OGLRender.cpp
  2. +5 −2 desmume/src/OGLRender.h
  3. +28 −9 desmume/src/OGLRender_3_2.cpp
@@ -307,12 +307,13 @@ static const char *fragmentShader_100 = {"\
uniform float stateAlphaTestRef;\n\
\n\
uniform int polyMode;\n\
- uniform bool polyEnableDepthWrite;\n\
+ uniform bool polyIsTranslucent;\n\
uniform bool polySetNewDepthForTranslucent;\n\
uniform int polyID;\n\
\n\
uniform bool polyEnableTexture;\n\
uniform bool polyEnableFog;\n\
+ uniform bool texDrawOpaque;\n\
uniform bool texSingleBitAlpha;\n\
\n\
uniform bool polyDrawShadow;\n\
@@ -351,6 +352,23 @@ static const char *fragmentShader_100 = {"\
mainTexColor.a = 1.0;\n\
}\n\
}\n\
+ else\n\
+ {\n\
+ if (texDrawOpaque)\n\
+ {\n\
+ if ( (polyMode != 1) && (mainTexColor.a <= 0.999) )\n\
+ {\n\
+ discard;\n\
+ }\n\
+ }\n\
+ else\n\
+ {\n\
+ if ( ((polyMode != 1) && (mainTexColor.a * vtxColor.a > 0.999)) || ((polyMode == 1) && (vtxColor.a > 0.999)) )\n\
+ {\n\
+ discard;\n\
+ }\n\
+ }\n\
+ }\n\
\n\
vec4 newFragColor = mainTexColor * vtxColor;\n\
\n\
@@ -374,7 +392,7 @@ static const char *fragmentShader_100 = {"\
discard;\n\
}\n\
\n\
- if (polyEnableDepthWrite && ((newFragColor.a > 0.999) || polySetNewDepthForTranslucent))\n\
+ if ( (newFragColor.a > 0.999) || polySetNewDepthForTranslucent )\n\
{\n\
newFragDepth = vec4(packVec3FromFloat(newFragDepthValue), 1.0);\n\
}\n\
@@ -1637,7 +1655,7 @@ Render3DError OpenGLRenderer_1_2::InitGeometryProgramShaderLocations()
OGLRef.uniformPolyTexScale = glGetUniformLocation(OGLRef.programGeometryID, "polyTexScale");
OGLRef.uniformPolyMode = glGetUniformLocation(OGLRef.programGeometryID, "polyMode");
- OGLRef.uniformPolyEnableDepthWrite = glGetUniformLocation(OGLRef.programGeometryID, "polyEnableDepthWrite");
+ OGLRef.uniformPolyIsTranslucent = glGetUniformLocation(OGLRef.programGeometryID, "polyIsTranslucent");
OGLRef.uniformPolySetNewDepthForTranslucent = glGetUniformLocation(OGLRef.programGeometryID, "polySetNewDepthForTranslucent");
OGLRef.uniformPolyAlpha = glGetUniformLocation(OGLRef.programGeometryID, "polyAlpha");
OGLRef.uniformPolyID = glGetUniformLocation(OGLRef.programGeometryID, "polyID");
@@ -1646,6 +1664,7 @@ Render3DError OpenGLRenderer_1_2::InitGeometryProgramShaderLocations()
OGLRef.uniformPolyEnableFog = glGetUniformLocation(OGLRef.programGeometryID, "polyEnableFog");
OGLRef.uniformTexSingleBitAlpha = glGetUniformLocation(OGLRef.programGeometryID, "texSingleBitAlpha");
+ OGLRef.uniformTexDrawOpaque = glGetUniformLocation(OGLRef.programGeometryID, "texDrawOpaque");
OGLRef.uniformPolyDrawShadow = glGetUniformLocation(OGLRef.programGeometryID, "polyDrawShadow");
return OGLERROR_NOERR;
@@ -2803,7 +2822,12 @@ Render3DError OpenGLRenderer_1_2::RenderGeometry(const GFX3D_State &renderState,
this->SetPolygonIndex(i);
glDrawElements(polyPrimitive, vertIndexCount, GL_UNSIGNED_SHORT, indexBufferPtr);
- if ( (thePoly.getAttributePolygonMode() == POLYGON_MODE_SHADOW) && (thePoly.getAttributePolygonID() != 0) )
+ if ( ((thePoly.getTexParamTexFormat() == TEXMODE_A3I5) || (thePoly.getTexParamTexFormat() == TEXMODE_A5I3)) && (thePoly.getAttributePolygonMode() != POLYGON_MODE_SHADOW) && (thePoly.isOpaque() || thePoly.isWireframe()) )
+ {
+ const GLboolean enableDepthWrite = ( (thePoly.getAttributePolygonMode() == POLYGON_MODE_DECAL && thePoly.isOpaque()) || thePoly.getAttributeEnableAlphaDepthWrite() ) ? GL_TRUE : GL_FALSE;
+ this->DrawAlphaTextureOpaqueFragments(polyPrimitive, vertIndexCount, indexBufferPtr, enableDepthWrite);
+ }
+ else if ( (thePoly.getAttributePolygonMode() == POLYGON_MODE_SHADOW) && (thePoly.getAttributePolygonID() != 0) )
{
const GLboolean enableDepthWrite = ( thePoly.isOpaque() || thePoly.getAttributeEnableAlphaDepthWrite() ) ? GL_TRUE : GL_FALSE;
this->DrawShadowPolygon(polyPrimitive, vertIndexCount, indexBufferPtr, enableDepthWrite, (thePoly.isOpaque()) ? thePoly.getAttributePolygonID() : 0);
@@ -2982,6 +3006,7 @@ void OpenGLRenderer_1_2::SetPolygonIndex(const size_t index)
Render3DError OpenGLRenderer_1_2::SetupPolygon(const POLY &thePoly)
{
const PolygonAttributes attr = thePoly.getAttributes();
+ const bool isOpaqueDecal = ((attr.polygonMode == POLYGON_MODE_DECAL) && attr.isOpaque);
// Set up depth test mode
static const GLenum oglDepthFunc[2] = {GL_LESS, GL_EQUAL};
@@ -3039,15 +3064,12 @@ Render3DError OpenGLRenderer_1_2::SetupPolygon(const POLY &thePoly)
}
else
{
- const u8 texFormat = thePoly.getTexParamTexFormat();
- const bool handlePolyAsTranslucent = (!attr.isWireframe && !attr.isOpaque)/* || ((texFormat == TEXMODE_A5I3) || (texFormat == TEXMODE_A3I5))*/;
-
glStencilFunc(GL_ALWAYS, attr.polygonID, 0x3F);
- glStencilOp(GL_KEEP, GL_KEEP, (handlePolyAsTranslucent) ? GL_KEEP : GL_REPLACE);
+ glStencilOp(GL_KEEP, GL_KEEP, (attr.isTranslucent && !isOpaqueDecal) ? GL_KEEP : GL_REPLACE);
glStencilMask(0xFF); // Drawing non-shadow polygons will implicitly reset the stencil buffer bits
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
- glDepthMask((!handlePolyAsTranslucent || attr.enableAlphaDepthWrite) ? GL_TRUE : GL_FALSE);
+ glDepthMask((!attr.isTranslucent || isOpaqueDecal || attr.enableAlphaDepthWrite) ? GL_TRUE : GL_FALSE);
}
// Set up polygon attributes
@@ -3058,7 +3080,7 @@ Render3DError OpenGLRenderer_1_2::SetupPolygon(const POLY &thePoly)
glUniform1i(OGLRef.uniformPolyEnableFog, (attr.enableRenderFog) ? GL_TRUE : GL_FALSE);
glUniform1f(OGLRef.uniformPolyAlpha, (attr.isWireframe) ? 1.0f : divide5bitBy31_LUT[attr.alpha]);
glUniform1i(OGLRef.uniformPolyID, attr.polygonID);
- glUniform1i(OGLRef.uniformPolyEnableDepthWrite, ( (attr.polygonMode != POLYGON_MODE_SHADOW) && (attr.isOpaque || attr.isWireframe || attr.enableAlphaDepthWrite) ) ? GL_TRUE : GL_FALSE);
+ glUniform1i(OGLRef.uniformPolyIsTranslucent, (attr.isTranslucent && !isOpaqueDecal) ? GL_TRUE : GL_FALSE);
glUniform1i(OGLRef.uniformPolySetNewDepthForTranslucent, (attr.enableAlphaDepthWrite) ? GL_TRUE : GL_FALSE);
}
else
@@ -3146,6 +3168,30 @@ Render3DError OpenGLRenderer_1_2::SetupViewport(const u32 viewportValue)
return OGLERROR_NOERR;
}
+Render3DError OpenGLRenderer_1_2::DrawAlphaTextureOpaqueFragments(const GLenum polyPrimitive, const GLsizei vertIndexCount, const GLushort *indexBufferPtr, const GLboolean enableDepthWrite)
+{
+ glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
+ glDepthMask(GL_TRUE);
+
+ if (this->isShaderSupported)
+ {
+ const OGLRenderRef &OGLRef = *this->ref;
+
+ glUniform1i(OGLRef.uniformTexDrawOpaque, GL_TRUE);
+ glDrawElements(polyPrimitive, vertIndexCount, GL_UNSIGNED_SHORT, indexBufferPtr);
+ glUniform1i(OGLRef.uniformTexDrawOpaque, GL_FALSE);
+ }
+ else
+ {
+ glDrawElements(polyPrimitive, vertIndexCount, GL_UNSIGNED_SHORT, indexBufferPtr);
+ }
+
+ glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
+ glDepthMask(enableDepthWrite);
+
+ return OGLERROR_NOERR;
+}
+
Render3DError OpenGLRenderer_1_2::DrawShadowPolygon(const GLenum polyPrimitive, const GLsizei vertIndexCount, const GLushort *indexBufferPtr, const GLboolean enableDepthWrite, const u8 opaquePolyID)
{
// Shadow polygons are actually drawn over the course of multiple passes.
@@ -377,7 +377,7 @@ struct OGLPolyStates
{
union
{
- struct { GLubyte enableTexture, enableFog, enableDepthWrite, setNewDepthForTranslucent; };
+ struct { GLubyte enableTexture, enableFog, isTranslucent, setNewDepthForTranslucent; };
GLubyte flags[4];
};
@@ -474,14 +474,15 @@ struct OGLRenderRef
GLint uniformPolyTexScale;
GLint uniformPolyMode;
- GLint uniformPolyEnableDepthWrite;
+ GLint uniformPolyIsTranslucent;
GLint uniformPolySetNewDepthForTranslucent;
GLint uniformPolyAlpha;
GLint uniformPolyID;
GLint uniformPolyEnableTexture;
GLint uniformPolyEnableFog;
GLint uniformTexSingleBitAlpha;
+ GLint uniformTexDrawOpaque;
GLint uniformPolyStateIndex;
GLint uniformPolyDrawShadow;
@@ -658,6 +659,7 @@ class OpenGLRenderer : public Render3D
virtual Render3DError DownsampleFBO() = 0;
virtual Render3DError ReadBackPixels() = 0;
+ virtual Render3DError DrawAlphaTextureOpaqueFragments(const GLenum polyPrimitive, const GLsizei vertIndexCount, const GLushort *indexBufferPtr, const GLboolean enableDepthWrite) = 0;
virtual Render3DError DrawShadowPolygon(const GLenum polyPrimitive, const GLsizei vertIndexCount, const GLushort *indexBufferPtr, const GLboolean enableDepthWrite, const u8 opaquePolyID) = 0;
virtual void SetPolygonIndex(const size_t index) = 0;
@@ -736,6 +738,7 @@ class OpenGLRenderer_1_2 : public OpenGLRenderer
virtual Render3DError SetupTexture(const POLY &thePoly, size_t polyRenderIndex);
virtual Render3DError SetupViewport(const u32 viewportValue);
+ virtual Render3DError DrawAlphaTextureOpaqueFragments(const GLenum polyPrimitive, const GLsizei vertIndexCount, const GLushort *indexBufferPtr, const GLboolean enableDepthWrite);
virtual Render3DError DrawShadowPolygon(const GLenum polyPrimitive, const GLsizei vertIndexCount, const GLushort *indexBufferPtr, const GLboolean enableDepthWrite, const u8 opaquePolyID);
public:
@@ -116,7 +116,7 @@ static const char *GeometryVtxShader_150 = {"\
out vec4 vtxColor; \n\
flat out uint polyEnableTexture;\n\
flat out uint polyEnableFog;\n\
- flat out uint polyEnableDepthWrite;\n\
+ flat out uint polyIsTranslucent;\n\
flat out uint polySetNewDepthForTranslucent;\n\
flat out uint polyMode;\n\
flat out uint polyID;\n\
@@ -133,7 +133,7 @@ static const char *GeometryVtxShader_150 = {"\
\n\
polyEnableTexture = polyStateFlags[0];\n\
polyEnableFog = polyStateFlags[1];\n\
- polyEnableDepthWrite = polyStateFlags[2];\n\
+ polyIsTranslucent = polyStateFlags[2];\n\
polySetNewDepthForTranslucent = polyStateFlags[3];\n\
polyMode = polyStateValues[1];\n\
polyID = polyStateValues[2];\n\
@@ -159,7 +159,7 @@ static const char *GeometryFragShader_150 = {"\
in vec4 vtxColor;\n\
flat in uint polyEnableTexture;\n\
flat in uint polyEnableFog;\n\
- flat in uint polyEnableDepthWrite;\n\
+ flat in uint polyIsTranslucent;\n\
flat in uint polySetNewDepthForTranslucent;\n\
flat in uint polyMode;\n\
flat in uint polyID;\n\
@@ -186,6 +186,7 @@ static const char *GeometryFragShader_150 = {"\
\n\
uniform sampler2D texRenderObject;\n\
uniform usamplerBuffer PolyStates;\n\
+ uniform bool texDrawOpaque;\n\
uniform bool polyDrawShadow;\n\
uniform int polyIndex;\n\
\n\
@@ -228,6 +229,23 @@ static const char *GeometryFragShader_150 = {"\
mainTexColor.a = 1.0;\n\
}\n\
}\n\
+ else\n\
+ {\n\
+ if (texDrawOpaque)\n\
+ {\n\
+ if ( (polyMode != 1u) && (mainTexColor.a <= 0.999) )\n\
+ {\n\
+ discard;\n\
+ }\n\
+ }\n\
+ else\n\
+ {\n\
+ if ( ((polyMode != 1u) && (mainTexColor.a * vtxColor.a > 0.999)) || ((polyMode == 1u) && (vtxColor.a > 0.999)) )\n\
+ {\n\
+ discard;\n\
+ }\n\
+ }\n\
+ }\n\
\n\
newFragColor = mainTexColor * vtxColor;\n\
\n\
@@ -251,7 +269,7 @@ static const char *GeometryFragShader_150 = {"\
discard;\n\
}\n\
\n\
- if ( bool(polyEnableDepthWrite) && ((newFragColor.a > 0.999) || bool(polySetNewDepthForTranslucent)) )\n\
+ if ( (newFragColor.a > 0.999) || bool(polySetNewDepthForTranslucent) )\n\
{\n\
newFragDepth = vec4(packVec3FromFloat(newFragDepthValue), 1.0);\n\
}\n\
@@ -1194,6 +1212,7 @@ Render3DError OpenGLRenderer_3_2::InitGeometryProgramShaderLocations()
glUniform1i(uniformTexRenderObject, 0);
glUniform1i(uniformTexBufferPolyStates, OGLTextureUnitID_PolyStates);
+ OGLRef.uniformTexDrawOpaque = glGetUniformLocation(OGLRef.programGeometryID, "texDrawOpaque");
OGLRef.uniformPolyDrawShadow = glGetUniformLocation(OGLRef.programGeometryID, "polyDrawShadow");
OGLRef.uniformPolyStateIndex = glGetUniformLocation(OGLRef.programGeometryID, "polyIndex");
@@ -1446,7 +1465,7 @@ Render3DError OpenGLRenderer_3_2::BeginRender(const GFX3D &engine)
polyStates[i].enableTexture = (this->_textureList[i]->IsSamplingEnabled()) ? GL_TRUE : GL_FALSE;
polyStates[i].enableFog = (polyAttr.enableRenderFog) ? GL_TRUE : GL_FALSE;
- polyStates[i].enableDepthWrite = ( (polyAttr.polygonMode != POLYGON_MODE_SHADOW) && (polyAttr.isOpaque || polyAttr.isWireframe || polyAttr.enableAlphaDepthWrite) ) ? GL_TRUE : GL_FALSE;
+ polyStates[i].isTranslucent = (polyAttr.isTranslucent && !((polyAttr.polygonMode == POLYGON_MODE_DECAL) && polyAttr.isOpaque)) ? GL_TRUE : GL_FALSE;
polyStates[i].setNewDepthForTranslucent = (polyAttr.enableAlphaDepthWrite) ? GL_TRUE : GL_FALSE;
polyStates[i].polyAlpha = (polyAttr.isWireframe) ? 0x1F : polyAttr.alpha;
polyStates[i].polyMode = polyAttr.polygonMode;
@@ -1465,6 +1484,7 @@ Render3DError OpenGLRenderer_3_2::BeginRender(const GFX3D &engine)
glUnmapBuffer(GL_ARRAY_BUFFER);
glUseProgram(OGLRef.programGeometryID);
+ glUniform1i(OGLRef.uniformTexDrawOpaque, GL_FALSE);
glUniform1i(OGLRef.uniformPolyDrawShadow, GL_FALSE);
return OGLERROR_NOERR;
@@ -1691,15 +1711,14 @@ Render3DError OpenGLRenderer_3_2::SetupPolygon(const POLY &thePoly)
}
else
{
- const u8 texFormat = thePoly.getTexParamTexFormat();
- const bool handlePolyAsTranslucent = (!attr.isWireframe && !attr.isOpaque)/* || ((texFormat == TEXMODE_A5I3) || (texFormat == TEXMODE_A3I5))*/;
+ const bool isOpaqueDecal = ((attr.polygonMode == POLYGON_MODE_DECAL) && attr.isOpaque);
glStencilFunc(GL_ALWAYS, attr.polygonID, 0x3F);
- glStencilOp(GL_KEEP, GL_KEEP, (handlePolyAsTranslucent) ? GL_KEEP : GL_REPLACE);
+ glStencilOp(GL_KEEP, GL_KEEP, (attr.isTranslucent && !isOpaqueDecal) ? GL_KEEP : GL_REPLACE);
glStencilMask(0xFF); // Drawing non-shadow polygons will implicitly reset the stencil buffer bits
glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
- glDepthMask((!handlePolyAsTranslucent || attr.enableAlphaDepthWrite) ? GL_TRUE : GL_FALSE);
+ glDepthMask((!attr.isTranslucent || isOpaqueDecal || attr.enableAlphaDepthWrite) ? GL_TRUE : GL_FALSE);
}
return OGLERROR_NOERR;

0 comments on commit 7b13501

Please sign in to comment.