Remove quads rendering mode entirely (#2593)

1 files changed, 31 insertions, 30 deletions

diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 0248f5710f..731e711cd1 100644
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -338,28 +338,19 @@ void LLViewerParcelMgr::renderRect(const LLVector3d &west_south_bottom_global,
     gGL.end();
 
     gGL.color4f(1.f, 1.f, 0.f, 0.2f);
-    gGL.begin(LLRender::QUADS);
-
-    gGL.vertex3f(west, north, nw_bottom);
-    gGL.vertex3f(west, north, nw_top);
-    gGL.vertex3f(east, north, ne_top);
-    gGL.vertex3f(east, north, ne_bottom);
-
-    gGL.vertex3f(east, north, ne_bottom);
-    gGL.vertex3f(east, north, ne_top);
-    gGL.vertex3f(east, south, se_top);
-    gGL.vertex3f(east, south, se_bottom);
-
-    gGL.vertex3f(east, south, se_bottom);
-    gGL.vertex3f(east, south, se_top);
-    gGL.vertex3f(west, south, sw_top);
-    gGL.vertex3f(west, south, sw_bottom);
-
-    gGL.vertex3f(west, south, sw_bottom);
-    gGL.vertex3f(west, south, sw_top);
-    gGL.vertex3f(west, north, nw_top);
-    gGL.vertex3f(west, north, nw_bottom);
-
+    gGL.begin(LLRender::TRIANGLE_STRIP);
+    {
+        gGL.vertex3f(west, north, nw_bottom);
+        gGL.vertex3f(west, north, nw_top);
+        gGL.vertex3f(east, north, ne_bottom);
+        gGL.vertex3f(east, north, ne_top);
+        gGL.vertex3f(east, south, se_bottom);
+        gGL.vertex3f(east, south, se_top);
+        gGL.vertex3f(west, south, sw_top);
+        gGL.vertex3f(west, south, sw_bottom);
+        gGL.vertex3f(west, north, nw_top);
+        gGL.vertex3f(west, north, nw_bottom);
+    }
     gGL.end();
 
     LLUI::setLineWidth(1.f);
@@ -493,6 +484,10 @@ void LLViewerParcelMgr::renderOneSegment(F32 x1, F32 y1, F32 x2, F32 y2, F32 hei
 
         gGL.vertex3f(x2, y2, z2);
 
+        gGL.vertex3f(x1, y1, z);
+
+        gGL.vertex3f(x2, y2, z2);
+
         z = z2+height;
         gGL.vertex3f(x2, y2, z);
     }
@@ -523,18 +518,24 @@ void LLViewerParcelMgr::renderOneSegment(F32 x1, F32 y1, F32 x2, F32 y2, F32 hei
         }
 
 
-        gGL.texCoord2f(tex_coord1*0.5f+0.5f, z1*0.5f);
+        gGL.texCoord2f(tex_coord1 * 0.5f + 0.5f, z1 * 0.5f);
         gGL.vertex3f(x1, y1, z1);
 
-        gGL.texCoord2f(tex_coord2*0.5f+0.5f, z2*0.5f);
+        gGL.texCoord2f(tex_coord2 * 0.5f + 0.5f, z2 * 0.5f);
         gGL.vertex3f(x2, y2, z2);
 
         // top edge stairsteps
-        z = llmax(z2+height, z1+height);
-        gGL.texCoord2f(tex_coord2*0.5f+0.5f, z*0.5f);
+        z = llmax(z2 + height, z1 + height);
+        gGL.texCoord2f(tex_coord2 * 0.5f + 0.5f, z * 0.5f);
+        gGL.vertex3f(x2, y2, z);
+
+        gGL.texCoord2f(tex_coord1 * 0.5f + 0.5f, z1 * 0.5f);
+        gGL.vertex3f(x1, y1, z1);
+
+        gGL.texCoord2f(tex_coord2 * 0.5f + 0.5f, z * 0.5f);
         gGL.vertex3f(x2, y2, z);
 
-        gGL.texCoord2f(tex_coord1*0.5f+0.5f, z*0.5f);
+        gGL.texCoord2f(tex_coord1 * 0.5f + 0.5f, z * 0.5f);
         gGL.vertex3f(x1, y1, z);
     }
 }
@@ -575,7 +576,7 @@ void LLViewerParcelMgr::renderHighlightSegments(const U8* segments, LLViewerRegi
                 if (!has_segments)
                 {
                     has_segments = true;
-                    gGL.begin(LLRender::QUADS);
+                    gGL.begin(LLRender::TRIANGLES);
                 }
                 renderOneSegment(x1, y1, x2, y2, PARCEL_POST_HEIGHT, SOUTH_MASK, regionp);
             }
@@ -591,7 +592,7 @@ void LLViewerParcelMgr::renderHighlightSegments(const U8* segments, LLViewerRegi
                 if (!has_segments)
                 {
                     has_segments = true;
-                    gGL.begin(LLRender::QUADS);
+                    gGL.begin(LLRender::TRIANGLES);
                 }
                 renderOneSegment(x1, y1, x2, y2, PARCEL_POST_HEIGHT, WEST_MASK, regionp);
             }
@@ -647,7 +648,7 @@ void LLViewerParcelMgr::renderCollisionSegments(U8* segments, bool use_pass, LLV
         gGL.getTexUnit(0)->bind(mBlockedImage);
     }
 
-    gGL.begin(LLRender::QUADS);
+    gGL.begin(LLRender::TRIANGLES);
 
     for (y = 0; y < STRIDE; y++)
     {