commit 7ab02fafb5de8cabadaa5eff10e473e79f9b027e
author Jamie Madill <jmadill@chromium.org> Tue Feb 04 16:04:08 2014 -0500
committer Jamie Madill <jmadill@chromium.org> Wed Feb 05 18:02:48 2014 +0000
tree 928710005dd0b1ea5635de33efb0e3c9a5ac42c0
parent 3078d0f718b27d541d2314bf9a30bbcc94e7f2e6

Add D3D11 vertex format tables to our format utils.

Moving the vertex format information to a globally accessible
helper file makes them available for the dynamic shaders logic.

Change-Id: I67d6280c0603d9c601ca504751c8905677c2426f
Reviewed-on: https://chromium-review.googlesource.com/184399
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libGLESv2/renderer/d3d11/InputLayoutCache.cpp

diff --git a/src/libGLESv2/renderer/d3d11/InputLayoutCache.cpp b/src/libGLESv2/renderer/d3d11/InputLayoutCache.cpp
index 75f74d6..b88a54f 100644
--- a/src/libGLESv2/renderer/d3d11/InputLayoutCache.cpp
+++ b/src/libGLESv2/renderer/d3d11/InputLayoutCache.cpp
@@ -15,6 +15,7 @@
 #include "libGLESv2/ProgramBinary.h"
 #include "libGLESv2/VertexAttribute.h"
 #include "libGLESv2/renderer/VertexDataManager.h"
+#include "libGLESv2/renderer/d3d11/formatutils11.h"
 
 #include "third_party/murmurhash/MurmurHash3.h"
 
@@ -99,9 +100,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);
+
+            gl::VertexFormat vertexFormat(*attributes[i].attribute, attributes[i].currentValueType);
+            DXGI_FORMAT dxgiFormat = gl_d3d11::GetNativeVertexFormat(vertexFormat);
 
             // Record the type of the associated vertex shader vector in our key
             // This will prevent mismatched vertex shaders from using the same input layout