Fix rendering for the closing line of line loops.

Trac #19035 Signed-off-by: Nicolas Capens Line loops via DrawArrays were incorrect because the vertex buffer already has the vertex offset factored in. Line loops via DrawElements were incorrect because the vertex buffer was offset by the minIndex. We need to use the same minIndex when rendering the closing loop. git-svn-id: https://angleproject.googlecode.com/svn/trunk@892 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fix rendering for the closing line of line loops.
102ca746 · daniel@transgaming.com · 7a2fdc9c · 102ca746 · 102ca746 · 102ca746
Commit 102ca746 authored Nov 24, 2011 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

version.h src/common/version.h +1 -1

Context.cpp src/libGLESv2/Context.cpp +6 -6

Context.h src/libGLESv2/Context.h +2 -2

No files found.
--- a/src/common/version.h
+++ b/src/common/version.h
 #define MAJOR_VERSION 0
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 891
+#define BUILD_REVISION 892

 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -2797,7 +2797,7 @@ void Context::drawArrays(GLenum mode, GLint first, GLsizei count)

        if (mode == GL_LINE_LOOP)   // Draw the last segment separately
        {
-            drawClosingLine(first, first + count - 1);
+            drawClosingLine(0, count - 1, 0);
        }
    }
 }
@@ -2862,7 +2862,7 @@ void Context::drawElements(GLenum mode, GLsizei count, GLenum type, const void *

        if (mode == GL_LINE_LOOP)   // Draw the last segment separately
        {
-            drawClosingLine(count, type, indices);
+            drawClosingLine(count, type, indices, indexInfo.minIndex);
        }
    }
 }
@@ -2914,7 +2914,7 @@ void Context::sync(bool block)
    }
 }

-void Context::drawClosingLine(unsigned int first, unsigned int last)
+void Context::drawClosingLine(unsigned int first, unsigned int last, int minIndex)
 {
    IDirect3DIndexBuffer9 *indexBuffer = NULL;
    bool succeeded = false;
@@ -2968,7 +2968,7 @@ void Context::drawClosingLine(unsigned int first, unsigned int last)
        mDevice->SetIndices(mClosingIB->getBuffer());
        mAppliedIBSerial = mClosingIB->getSerial();

-        mDevice->DrawIndexedPrimitive(D3DPT_LINELIST, 0, 0, last, offset, 1);
+        mDevice->DrawIndexedPrimitive(D3DPT_LINELIST, -minIndex, minIndex, last, offset, 1);
    }
    else
    {
@@ -2977,7 +2977,7 @@ void Context::drawClosingLine(unsigned int first, unsigned int last)
    }
 }

-void Context::drawClosingLine(GLsizei count, GLenum type, const void *indices)
+void Context::drawClosingLine(GLsizei count, GLenum type, const void *indices, int minIndex)
 {
    unsigned int first = 0;
    unsigned int last = 0;
@@ -3006,7 +3006,7 @@ void Context::drawClosingLine(GLsizei count, GLenum type, const void *indices)
      default: UNREACHABLE();
    }

-    drawClosingLine(first, last);
+    drawClosingLine(first, last, minIndex);
 }

 void Context::recordInvalidEnum()

--- a/src/libGLESv2/Context.h
+++ b/src/libGLESv2/Context.h
@@ -431,8 +431,8 @@ class Context
    void sync(bool block);   // flush/finish

 	// Draw the last segment of a line loop
-    void drawClosingLine(unsigned int first, unsigned int last);
-    void drawClosingLine(GLsizei count, GLenum type, const void *indices);
+    void drawClosingLine(unsigned int first, unsigned int last, int minIndex);
+    void drawClosingLine(GLsizei count, GLenum type, const void *indices, int minIndex);

    void recordInvalidEnum();
    void recordInvalidValue();