Fix an issue with instanced drawing in the D3D9 path.

TRAC #22447 Signed-off-by: Geoff Lang Signed-off-by: Nicolas Capens Author: Jamie Madill git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1787 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fix an issue with instanced drawing in the D3D9 path.
51817d40 · shannon.woods@transgaming.com · 3e773bb4 · 51817d40
Commit 51817d40 authored Jan 25, 2013 by shannon.woods@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 11 deletions

VertexDeclarationCache.cpp src/libGLESv2/renderer/VertexDeclarationCache.cpp +6 -11

No files found.
--- a/src/libGLESv2/renderer/VertexDeclarationCache.cpp
+++ b/src/libGLESv2/renderer/VertexDeclarationCache.cpp
@@ -56,21 +56,16 @@ GLenum VertexDeclarationCache::applyDeclaration(IDirect3DDevice9 *device, Transl
        {
            if (attributes[i].active)
            {
-                if (indexedAttribute == gl::MAX_VERTEX_ATTRIBS)
+                if (indexedAttribute == gl::MAX_VERTEX_ATTRIBS && attributes[i].divisor == 0)
                {
-                    if (attributes[i].divisor == 0)
-                    {
-                        indexedAttribute = i;
-                    }
+                    indexedAttribute = i;
                }
-                else if (instancedAttribute == gl::MAX_VERTEX_ATTRIBS)
+                else if (instancedAttribute == gl::MAX_VERTEX_ATTRIBS && attributes[i].divisor != 0)
                {
-                    if (attributes[i].divisor != 0)
-                    {
-                        instancedAttribute = i;
-                    }
+                    instancedAttribute = i;
                }
-                else break;   // Found both an indexed and instanced attribute
+                if (indexedAttribute != gl::MAX_VERTEX_ATTRIBS && instancedAttribute != gl::MAX_VERTEX_ATTRIBS)
+                    break;   // Found both an indexed and instanced attribute
            }
        }