1 files changed, 48 insertions, 0 deletions
diff --git a/src/angle/patches/0012-ANGLE-fix-semantic-index-lookup.patch b/src/angle/patches/0012-ANGLE-fix-semantic-index-lookup.patch
new file mode 100644
index 0000000000..fe16d1d7b2
--- /dev/null
+++ b/src/angle/patches/0012-ANGLE-fix-semantic-index-lookup.patch
@@ -0,0 +1,48 @@
+From 15b694fa33cf76f93de62b8106972083f5fb3114 Mon Sep 17 00:00:00 2001
+From: Andrew Knight <andrew.knight@digia.com>
+Date: Fri, 21 Feb 2014 13:34:21 +0200
+Subject: [PATCH] ANGLE: fix semantic index lookup
+
+The sorted semantic index table was returning a direct mapping to the
+new indices, instead of the old indices. This caused a mismatch in the
+GL type lookup for the translated attribute.
+
+Change-Id: I75d05ed707f56c45210e3dcbc277f894e3dc5a48
+---
+ src/3rdparty/angle/src/libGLESv2/ProgramBinary.cpp                   | 2 +-
+ src/3rdparty/angle/src/libGLESv2/renderer/d3d11/InputLayoutCache.cpp | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/3rdparty/angle/src/libGLESv2/ProgramBinary.cpp b/src/3rdparty/angle/src/libGLESv2/ProgramBinary.cpp
+index 41a83b6..13c515a 100644
+--- a/src/3rdparty/angle/src/libGLESv2/ProgramBinary.cpp
++++ b/src/3rdparty/angle/src/libGLESv2/ProgramBinary.cpp
+@@ -2643,7 +2643,7 @@ void ProgramBinary::sortAttributesByLayout(rx::TranslatedAttribute attributes[MA
+     for (int i = 0; i < MAX_VERTEX_ATTRIBS; i++)
+     {
+         int oldIndex = mAttributesByLayout[i];
+-        sortedSemanticIndices[i] = mSemanticIndex[oldIndex];
++        sortedSemanticIndices[i] = oldIndex;
+         attributes[i] = oldTranslatedAttributes[oldIndex];
+     }
+ }
+diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/InputLayoutCache.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/InputLayoutCache.cpp
+index 3418e89..4940b8c 100644
+--- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/InputLayoutCache.cpp
++++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/InputLayoutCache.cpp
+@@ -103,10 +103,10 @@ GLenum InputLayoutCache::applyVertexBuffers(TranslatedAttribute attributes[gl::M
+             // Record the type of the associated vertex shader vector in our key
+             // This will prevent mismatched vertex shaders from using the same input layout
+             GLint attributeSize;
+-            programBinary->getActiveAttribute(ilKey.elementCount, 0, NULL, &attributeSize, &ilKey.elements[ilKey.elementCount].glslElementType, NULL);
++            programBinary->getActiveAttribute(sortedSemanticIndices[i], 0, NULL, &attributeSize, &ilKey.elements[ilKey.elementCount].glslElementType, NULL);
+ 
+             ilKey.elements[ilKey.elementCount].desc.SemanticName = semanticName;
+-            ilKey.elements[ilKey.elementCount].desc.SemanticIndex = sortedSemanticIndices[i];
++            ilKey.elements[ilKey.elementCount].desc.SemanticIndex = i;
+             ilKey.elements[ilKey.elementCount].desc.Format = attributes[i].attribute->mArrayEnabled ? vertexBuffer->getDXGIFormat(*attributes[i].attribute) : DXGI_FORMAT_R32G32B32A32_FLOAT;
+             ilKey.elements[ilKey.elementCount].desc.InputSlot = i;
+             ilKey.elements[ilKey.elementCount].desc.AlignedByteOffset = 0;
+-- 
+1.8.4.msysgit.0
+