Second Life viewer sources 1.20.6

5 files changed, 83 insertions, 122 deletions

diff --git a/linden/indra/llrender/llfontgl.cpp b/linden/indra/llrender/llfontgl.cpp
index 53e8c2b..938dd73 100644
--- a/linden/indra/llrender/llfontgl.cpp
+++ b/linden/indra/llrender/llfontgl.cpp
@@ -845,7 +845,7 @@ S32 LLFontGL::render(const LLWString &wstr,
         if (style & UNDERLINE)
         {
                 LLGLSNoTexture no_texture;
-                gGL.begin(GL_LINES);
+                gGL.begin(LLVertexBuffer::LINES);
                 gGL.vertex2f(start_x, cur_y - (mDescender));
                 gGL.vertex2f(cur_x, cur_y - (mDescender));
                 gGL.end();
@@ -1340,7 +1340,7 @@ void LLFontGL::drawGlyph(const LLRectf& screen_rect, const LLRectf& uv_rect, con
         F32 slant_offset;
         slant_offset = ((style & ITALIC) ? ( -mAscender * 0.2f) : 0.f);
 
-        gGL.begin(GL_QUADS);
+        gGL.begin(LLVertexBuffer::QUADS);
         {
                 //FIXME: bold and drop shadow are mutually exclusive only for convenience
                 //Allow both when we need them.
diff --git a/linden/indra/llrender/llglimmediate.cpp b/linden/indra/llrender/llglimmediate.cpp
index da9239d..edc694a 100644
--- a/linden/indra/llrender/llglimmediate.cpp
+++ b/linden/indra/llrender/llglimmediate.cpp
@@ -36,64 +36,19 @@
 
 LLGLImmediate gGL;
 
-#ifdef LL_RELEASE_FOR_DOWNLOAD
-#define IMM_ERRS llwarns
-#else
-#define IMM_ERRS llerrs
-#endif
-
 bool LLGLImmediate::sClever = false;
-BOOL LLGLImmediate::sStarted = FALSE;
+
+const U32 immediate_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_TEXCOORD;
 
 LLGLImmediate::LLGLImmediate()
 {
         mCount = 0;
-        mMode = GL_TRIANGLES;
-        memset(mBuffer, 0, sizeof(Vertex)*4096);
-}
-
-void LLGLImmediate::start()
-{
-        if(sClever)
-        {
-                if (sStarted)
-                {
-                        llerrs << "Redundant start." << llendl;
-                }
-                
-                LLVertexBuffer::unbind();
-                sStarted = TRUE;
-                
-                glEnableClientState(GL_VERTEX_ARRAY);
-                glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-                glEnableClientState(GL_COLOR_ARRAY);
-
-                const U32 stride = sizeof(Vertex);
-
-                glVertexPointer(3, GL_FLOAT, stride, &(mBuffer[0].v));
-                glTexCoordPointer(2, GL_FLOAT, stride, &(mBuffer[0].uv));
-                glColorPointer(4, GL_UNSIGNED_BYTE, stride, &(mBuffer[0].c));
-                
-                color4f(1,1,1,1);
-        }
-}
-
-void LLGLImmediate::stop()
-{
-        if (sClever)
-        {
-                if (!sStarted)
-                {
-                        llerrs << "Redundant stop." << llendl;
-                }
-                
-                flush();
-                
-                sStarted = FALSE;
-                
-                glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-                glDisableClientState(GL_COLOR_ARRAY);
-        }
+        mMode = LLVertexBuffer::TRIANGLES;
+        mBuffer = new LLVertexBuffer(immediate_mask, 0);
+        mBuffer->allocateBuffer(4096, 0, TRUE);
+        mBuffer->getVertexStrider(mVerticesp);
+        mBuffer->getTexCoordStrider(mTexcoordsp);
+        mBuffer->getColorStrider(mColorsp);
 }
 
 void LLGLImmediate::translatef(const GLfloat& x, const GLfloat& y, const GLfloat& z)
@@ -116,10 +71,7 @@ void LLGLImmediate::popMatrix()
 
 void LLGLImmediate::blendFunc(GLenum sfactor, GLenum dfactor)
 {
-        if (sStarted)
-        {
-                flush();
-        }
+        flush();
         glBlendFunc(sfactor, dfactor);
 }
 
@@ -129,10 +81,10 @@ void LLGLImmediate::begin(const GLuint& mode)
         {
                 if (mode != mMode)
                 {
-                        if (mMode == GL_QUADS ||
-                                mMode == GL_LINES ||
-                                mMode == GL_TRIANGLES ||
-                                mMode == GL_POINTS)
+                        if (mMode == LLVertexBuffer::QUADS ||
+                                mMode == LLVertexBuffer::LINES ||
+                                mMode == LLVertexBuffer::TRIANGLES ||
+                                mMode == LLVertexBuffer::POINTS)
                         {
                                 flush();
                         }
@@ -146,7 +98,7 @@ void LLGLImmediate::begin(const GLuint& mode)
         }
         else
         {
-                glBegin(mode);
+                glBegin(LLVertexBuffer::sGLMode[mode]);
         }
 }
 
@@ -156,13 +108,14 @@ void LLGLImmediate::end()
         {
                 if (mCount == 0)
                 {
-                        IMM_ERRS << "GL begin and end called with no vertices specified." << llendl;
+                        return;
+                        //IMM_ERRS << "GL begin and end called with no vertices specified." << llendl;
                 }
 
-                if ((mMode != GL_QUADS && 
-                        mMode != GL_LINES &&
-                        mMode != GL_TRIANGLES &&
-                        mMode != GL_POINTS) ||
+                if ((mMode != LLVertexBuffer::QUADS && 
+                        mMode != LLVertexBuffer::LINES &&
+                        mMode != LLVertexBuffer::TRIANGLES &&
+                        mMode != LLVertexBuffer::POINTS) ||
                         mCount > 2048)
                 {
                         flush();
@@ -221,12 +174,13 @@ void LLGLImmediate::flush()
                                 llerrs << "foo 6" << llendl;
                         }
 #endif
-                        if (!sStarted)
-                        {
-                                llerrs << "Drawing call issued outside start/stop." << llendl;
-                        }
-                        glDrawArrays(mMode, 0, mCount);
-                        mBuffer[0] = mBuffer[mCount];
+                        
+                        mBuffer->setBuffer(immediate_mask);
+                        mBuffer->drawArrays(mMode, 0, mCount);
+
+                        mVerticesp[0] = mVerticesp[mCount];
+                        mTexcoordsp[0] = mTexcoordsp[mCount];
+                        mColorsp[0] = mColorsp[mCount];
                         mCount = 0;
                 }
         }
@@ -242,13 +196,13 @@ void LLGLImmediate::vertex3f(const GLfloat& x, const GLfloat& y, const GLfloat&
                         return;
                 }
 
-                mBuffer[mCount].v[0] = x;
-                mBuffer[mCount].v[1] = y;
-                mBuffer[mCount].v[2] = z;
+                mVerticesp[mCount] = LLVector3(x,y,z);
                 mCount++;
                 if (mCount < 4096)
                 {
-                        mBuffer[mCount] = mBuffer[mCount-1];
+                        mVerticesp[mCount] = mVerticesp[mCount-1];
+                        mColorsp[mCount] = mColorsp[mCount-1];
+                        mTexcoordsp[mCount] = mTexcoordsp[mCount-1];
                 }
         }
         else
@@ -281,8 +235,7 @@ void LLGLImmediate::texCoord2f(const GLfloat& x, const GLfloat& y)
 { 
         if (sClever)
         {
-                mBuffer[mCount].uv[0] = x;
-                mBuffer[mCount].uv[1] = y;
+                mTexcoordsp[mCount] = LLVector2(x,y);
         }
         else
         {
@@ -304,10 +257,7 @@ void LLGLImmediate::color4ub(const GLubyte& r, const GLubyte& g, const GLubyte&
 {
         if (sClever)
         {
-                mBuffer[mCount].c[0] = r;
-                mBuffer[mCount].c[1] = g;
-                mBuffer[mCount].c[2] = b;
-                mBuffer[mCount].c[3] = a;
+                mColorsp[mCount] = LLColor4U(r,g,b,a);
         }
         else
         {
@@ -345,7 +295,6 @@ void LLGLImmediate::color3fv(const GLfloat* c)
 
 void LLGLImmediate::setClever(bool do_clever)
 {
-        llassert(!sStarted);
         llassert(mCount == 0);
 
         sClever = do_clever;
diff --git a/linden/indra/llrender/llglimmediate.h b/linden/indra/llrender/llglimmediate.h
index cf4dc4f..e0cddff 100644
--- a/linden/indra/llrender/llglimmediate.h
+++ b/linden/indra/llrender/llglimmediate.h
@@ -40,6 +40,7 @@
 #include "stdtypes.h"
 #include "llgltypes.h"
 #include "llglheaders.h"
+#include "llvertexbuffer.h"
 
 class LLGLImmediate
 {
@@ -50,8 +51,6 @@ public:
         void pushMatrix();
         void popMatrix();
         void blendFunc(GLenum sfactor, GLenum dfactor);
-        void start();
-        void stop();
         void flush();
 
         void begin(const GLuint& mode);
@@ -91,15 +90,15 @@ public:
                 GLfloat uv[2];
         };
 
-public:
-        static BOOL sStarted;
-
 private:
         static bool sClever;
         
         U32 mCount;
         U32 mMode;
-        Vertex mBuffer[4096];
+        LLPointer<LLVertexBuffer> mBuffer;
+        LLStrider<LLVector3> mVerticesp;
+        LLStrider<LLVector2> mTexcoordsp;
+        LLStrider<LLColor4U> mColorsp;
 };
 
 extern LLGLImmediate gGL;
diff --git a/linden/indra/llrender/llvertexbuffer.cpp b/linden/indra/llrender/llvertexbuffer.cpp
index ce80343..4c663e2 100644
--- a/linden/indra/llrender/llvertexbuffer.cpp
+++ b/linden/indra/llrender/llvertexbuffer.cpp
@@ -60,7 +60,6 @@ U32 LLVertexBuffer::sLastMask = 0;
 BOOL LLVertexBuffer::sVBOActive = FALSE;
 BOOL LLVertexBuffer::sIBOActive = FALSE;
 U32 LLVertexBuffer::sAllocatedBytes = 0;
-BOOL LLVertexBuffer::sRenderActive = FALSE;
 BOOL LLVertexBuffer::sMapped = FALSE;
 
 std::vector<U32> LLVertexBuffer::sDeleteList;
@@ -84,16 +83,18 @@ U32 LLVertexBuffer::sGLMode[LLVertexBuffer::NUM_MODES] =
         GL_TRIANGLE_FAN,
         GL_POINTS,
         GL_LINES,
-        GL_LINE_STRIP
+        GL_LINE_STRIP,
+        GL_QUADS,
+        GL_LINE_LOOP,
 };
 
 //static
 void LLVertexBuffer::setupClientArrays(U32 data_mask)
 {
-        if (LLGLImmediate::sStarted)
+        /*if (LLGLImmediate::sStarted)
         {
                 llerrs << "Cannot use LLGLImmediate and LLVertexBuffer simultaneously!" << llendl;
-        }
+        }*/
 
         if (sLastMask != data_mask)
         {
@@ -186,6 +187,11 @@ void LLVertexBuffer::drawRange(U32 mode, U32 start, U32 end, U32 count, U32 indi
                 llerrs << "Wrong vertex buffer bound." << llendl;
         }
 
+        if (mode > NUM_MODES)
+        {
+                llerrs << "Invalid draw mode: " << mode << llendl;
+        }
+
         glDrawRangeElements(sGLMode[mode], start, end, count, GL_UNSIGNED_SHORT, 
                 ((U16*) getIndicesPointer()) + indices_offset);
 }
@@ -208,10 +214,37 @@ void LLVertexBuffer::draw(U32 mode, U32 count, U32 indices_offset) const
                 llerrs << "Wrong vertex buffer bound." << llendl;
         }
 
+        if (mode > NUM_MODES)
+        {
+                llerrs << "Invalid draw mode: " << mode << llendl;
+        }
+
         glDrawElements(sGLMode[mode], count, GL_UNSIGNED_SHORT,
                 ((U16*) getIndicesPointer()) + indices_offset);
 }
 
+void LLVertexBuffer::drawArrays(U32 mode, U32 first, U32 count) const
+{
+        
+        if (first >= (U32) mRequestedNumVerts ||
+                first + count > (U32) mRequestedNumVerts)
+        {
+                llerrs << "Bad vertex buffer draw range: [" << first << ", " << first+count << "]" << llendl;
+        }
+
+        if (mGLBuffer != sGLRenderBuffer)
+        {
+                llerrs << "Wrong vertex buffer bound." << llendl;
+        }
+
+        if (mode > NUM_MODES)
+        {
+                llerrs << "Invalid draw mode: " << mode << llendl;
+        }
+
+        glDrawArrays(sGLMode[mode], first, count);
+}
+
 //static
 void LLVertexBuffer::initClass(bool use_vbo)
 {
@@ -246,24 +279,8 @@ void LLVertexBuffer::unbind()
 void LLVertexBuffer::cleanupClass()
 {
         LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
-        startRender(); 
-        stopRender();
-        clientCopy(); // deletes GL buffers
-}
-
-//static, call before rendering VBOs
-void LLVertexBuffer::startRender()
-{               
-        LLMemType mt(LLMemType::MTYPE_VERTEX_DATA);
-
-        unbind();
-        sRenderActive = TRUE;
-}
-
-void LLVertexBuffer::stopRender()
-{
         unbind();
-        sRenderActive = FALSE;
+        clientCopy(); // deletes GL buffers
 }
 
 void LLVertexBuffer::clientCopy(F64 max_time)
@@ -717,7 +734,7 @@ BOOL LLVertexBuffer::useVBOs() const
                 return FALSE;
         }
 #endif
-        return sEnableVBOs; // && (!sRenderActive || !mLocked);
+        return sEnableVBOs;
 }
 
 //----------------------------------------------------------------------------
@@ -1000,10 +1017,6 @@ void LLVertexBuffer::setBuffer(U32 data_mask)
                 sGLRenderBuffer = mGLBuffer;
                 if (data_mask && setup)
                 {
-                        if (!sRenderActive)
-                        {
-                                llwarns << "Vertex buffer set for rendering outside of render frame." << llendl;
-                        }
                         setupVertexBuffer(data_mask); // subclass specific setup (virtual function)
                         sSetCount++;
                 }
diff --git a/linden/indra/llrender/llvertexbuffer.h b/linden/indra/llrender/llvertexbuffer.h
index 453f3ac..64a6f60 100644
--- a/linden/indra/llrender/llvertexbuffer.h
+++ b/linden/indra/llrender/llvertexbuffer.h
@@ -85,9 +85,7 @@ public:
         static void initClass(bool use_vbo);
         static void cleanupClass();
         static void setupClientArrays(U32 data_mask);
-        static void startRender(); //between start and stop render, no client copies will occur
-        static void stopRender(); //any buffer not copied to GL will be rendered from client memory
-        static void clientCopy(F64 max_time = 0.005); //copy data from client to GL
+        static void clientCopy(F64 max_time = 0.005); //copy data from client to GL
         static void unbind(); //unbind any bound vertex buffer
 
         //get the size of a vertex with the given typemask
@@ -131,6 +129,8 @@ public:
                 POINTS,
                 LINES,
                 LINE_STRIP,
+                QUADS,
+                LINE_LOOP,
                 NUM_MODES
         };
 protected:
@@ -205,6 +205,7 @@ public:
         void markDirty(U32 vert_index, U32 vert_count, U32 indices_index, U32 indices_count);
 
         void draw(U32 mode, U32 count, U32 indices_offset) const;
+        void drawArrays(U32 mode, U32 offset, U32 count) const;
         void drawRange(U32 mode, U32 start, U32 end, U32 count, U32 indices_offset) const;
 
 protected:      
@@ -244,7 +245,6 @@ protected:
         std::vector<DirtyRegion> mDirtyRegions; //vector of dirty regions to rebuild
 
 public:
-        static BOOL sRenderActive;
         static S32 sCount;
         static S32 sGLCount;
         static S32 sMappedCount;