commit a857c36bc1e9f1178c5eaa3e80bfe543a5408467
author Jamie Madill <jamie@nullspace.ca> Tue Jul 02 11:57:02 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:06:07 2013 -0400
tree 633ab6c066846d6745a6d4346baf6012250c2853
parent 879397104fa488dd59d9e318fd4b1f0ef65d17d0

Refactor VertexAttribute to split the "current value" for generic attributes into its own class.

VAOs in GLES 3 do not store the current values, so these must be handled separately from other Vertex
Attribute data.

TRAC #23390

Signed-off-by: Shannon Woods
Signed-off-by: Geoff Lang
Authored-by: Jamie Madill

src/libGLESv2/renderer/InputLayoutCache.cpp

diff --git a/src/libGLESv2/renderer/InputLayoutCache.cpp b/src/libGLESv2/renderer/InputLayoutCache.cpp
index a9d4857..28b0767 100644
--- a/src/libGLESv2/renderer/InputLayoutCache.cpp
+++ b/src/libGLESv2/renderer/InputLayoutCache.cpp
@@ -79,6 +79,9 @@
             BufferStorage11 *bufferStorage = attributes[i].storage ? BufferStorage11::makeBufferStorage11(attributes[i].storage) : NULL;
 
             D3D11_INPUT_CLASSIFICATION inputClass = attributes[i].divisor > 0 ? D3D11_INPUT_PER_INSTANCE_DATA : D3D11_INPUT_PER_VERTEX_DATA;
+            DXGI_FORMAT dxgiFormat = attributes[i].attribute->mArrayEnabled ?
+                                     VertexBuffer11::getAttributeDXGIFormat(*attributes[i].attribute) :
+                                     VertexBuffer11::getCurrentValueDXGIFormat(attributes[i].currentValueType);
 
             // Record the type of the associated vertex shader vector in our key
             // This will prevent mismatched vertex shaders from using the same input layout
@@ -87,7 +90,7 @@
 
             ilKey.elements[ilKey.elementCount].SemanticName = semanticName;
             ilKey.elements[ilKey.elementCount].SemanticIndex = sortedSemanticIndices[i];
-            ilKey.elements[ilKey.elementCount].Format = vertexBuffer->getDXGIFormat(*attributes[i].attribute);
+            ilKey.elements[ilKey.elementCount].Format = dxgiFormat;
             ilKey.elements[ilKey.elementCount].InputSlot = i;
             ilKey.elements[ilKey.elementCount].AlignedByteOffset = 0;
             ilKey.elements[ilKey.elementCount].InputSlotClass = inputClass;