Vertex data translation broke the text in PVR samples.

TRAC #11412 Indexed rendering was always broken because the size calculated was offset incorrectly (part of a removed optimisation). copyComponents was broken when I switched from incremental addressing to explicitly-indexed addressing. Signed-off-by: Daniel Koch Author: Andrew Lewycky <andrew.lewycky@transgaming.com> git-svn-id: https://angleproject.googlecode.com/svn/trunk@17 736b8ea6-26fd-11df-bfd4-992fa37f6226

Vertex data translation broke the text in PVR samples.
c21c2271 · daniel@transgaming.com · 86487c20 · c21c2271 · c21c2271
Commit c21c2271 authored Mar 11, 2010 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

VertexDataManager.cpp libGLESv2/geometry/VertexDataManager.cpp +1 -1

vertexconversion.h libGLESv2/geometry/vertexconversion.h +2 -2

No files found.
--- a/libGLESv2/geometry/VertexDataManager.cpp
+++ b/libGLESv2/geometry/VertexDataManager.cpp
@@ -173,7 +173,7 @@ GLenum VertexDataManager::internalPreRenderValidate(const AttributeState *attrib
    // Handle any attributes needing translation or lifting.
    if (translateOrLift.any())
    {
-        std::size_t count = maxIndex - minIndex + 1;
+        std::size_t count = maxIndex + 1;

        std::size_t requiredSpace = 0;


--- a/libGLESv2/geometry/vertexconversion.h
+++ b/libGLESv2/geometry/vertexconversion.h
@@ -213,11 +213,11 @@ struct VertexDataConverter
        {
            if (WidenRule::initialWidth > elementindex)
            {
-                *out = Converter::convert(in[elementindex]);
+                out[elementindex] = Converter::convert(in[elementindex]);
            }
            else
            {
-                *out = defaultvalue;
+                out[elementindex] = defaultvalue;
            }
        }
    }