1 files changed, 42 insertions, 10 deletions

diff --git a/src/GPU3D_OpenGL.cpp b/src/GPU3D_OpenGL.cpp
index 72b3fc6..658b261 100644
--- a/src/GPU3D_OpenGL.cpp
+++ b/src/GPU3D_OpenGL.cpp
@@ -113,7 +113,7 @@ GLuint TexMemID;
 GLuint TexPalMemID;
 
 int ScaleFactor;
-bool Antialias;
+bool BetterPolygons;
 int ScreenW, ScreenH;
 
 GLuint FramebufferTex[8];
@@ -405,6 +405,7 @@ void SetRenderSettings(GPU::RenderSettings& settings)
     int scale = settings.GL_ScaleFactor;
 
     ScaleFactor = scale;
+    BetterPolygons = settings.GL_BetterPolygons;
 
     ScreenW = 256 * scale;
     ScreenH = 192 * scale;
@@ -519,6 +520,27 @@ u32* SetupVertex(Polygon* poly, int vid, Vertex* vtx, u32 vtxattr, u32* vptr)
         y = vtx->FinalPosition[1];
     }
 
+    // correct nearly-vertical edges that would look vertical on the DS
+    /*{
+        int vtopid = vid - 1;
+        if (vtopid < 0) vtopid = poly->NumVertices-1;
+        Vertex* vtop = poly->Vertices[vtopid];
+        if (vtop->FinalPosition[1] >= vtx->FinalPosition[1])
+        {
+            vtopid = vid + 1;
+            if (vtopid >= poly->NumVertices) vtopid = 0;
+            vtop = poly->Vertices[vtopid];
+        }
+        if ((vtop->FinalPosition[1] < vtx->FinalPosition[1]) &&
+            (vtx->FinalPosition[0] == vtop->FinalPosition[0]-1))
+        {
+            if (ScaleFactor > 1)
+                x = (vtop->HiresPosition[0] * ScaleFactor) >> 4;
+            else
+                x = vtop->FinalPosition[0];
+        }
+    }*/
+
     *vptr++ = x | (y << 16);
     *vptr++ = z | (w << 16);
 
@@ -614,7 +636,7 @@ void BuildPolygons(RendererPolygon* polygons, int npolys)
         {
             rp->PrimType = GL_TRIANGLES;
 
-            if (false)
+            if (!BetterPolygons)
             {
                 // regular triangle-splitting
 
@@ -814,6 +836,10 @@ void RenderSceneChunk(int y, int h)
 
     GLboolean fogenable = (RenderDispCnt & (1<<7)) ? GL_TRUE : GL_FALSE;
 
+    // TODO: proper 'equal' depth test!
+    // (has margin of +-0x200 in Z-buffer mode, +-0xFF in W-buffer mode)
+    // for now we're using GL_LEQUAL to make it work to some extent
+
     // pass 1: opaque pixels
 
     UseRenderShader(flags);
@@ -832,8 +858,10 @@ void RenderSceneChunk(int y, int h)
 
         if (rp->PolyData->IsShadowMask) { i++; continue; }
 
-        // zorp
-        glDepthFunc(GL_LESS);
+        if (rp->PolyData->Attr & (1<<14))
+            glDepthFunc(GL_LEQUAL);
+        else
+            glDepthFunc(GL_LESS);
 
         u32 polyattr = rp->PolyData->Attr;
         u32 polyid = (polyattr >> 24) & 0x3F;
@@ -918,8 +946,10 @@ void RenderSceneChunk(int y, int h)
                 {
                     UseRenderShader(flags | RenderFlag_Trans);
 
-                    // zorp
-                    glDepthFunc(GL_LESS);
+                    if (rp->PolyData->Attr & (1<<14))
+                        glDepthFunc(GL_LEQUAL);
+                    else
+                        glDepthFunc(GL_LESS);
 
                     u32 polyattr = rp->PolyData->Attr;
                     u32 polyid = (polyattr >> 24) & 0x3F;
@@ -1009,8 +1039,10 @@ void RenderSceneChunk(int y, int h)
                 if (!(polyattr & (1<<15))) transfog = fogenable;
                 else                       transfog = GL_FALSE;
 
-                // zorp
-                glDepthFunc(GL_LESS);
+                if (rp->PolyData->Attr & (1<<14))
+                    glDepthFunc(GL_LEQUAL);
+                else
+                    glDepthFunc(GL_LESS);
 
                 if (rp->PolyData->IsShadow)
                 {
@@ -1076,9 +1108,9 @@ void RenderSceneChunk(int y, int h)
         glStencilMask(0);
 
         glActiveTexture(GL_TEXTURE0);
-        glBindTexture(GL_TEXTURE_2D, FramebufferTex[4]);
+        glBindTexture(GL_TEXTURE_2D, FramebufferTex[FrontBuffer ? 6 : 4]);
         glActiveTexture(GL_TEXTURE1);
-        glBindTexture(GL_TEXTURE_2D, FramebufferTex[5]);
+        glBindTexture(GL_TEXTURE_2D, FramebufferTex[FrontBuffer ? 7 : 5]);
 
         glBindBuffer(GL_ARRAY_BUFFER, ClearVertexBufferID);
         glBindVertexArray(ClearVertexArrayID);