commit db1899ced07525c7efe27886ef131ab09bb5072a
author shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Feb 28 23:08:33 2013 +0000
committer shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Feb 28 23:08:33 2013 +0000
tree c0decc58c61ba0ffd68ffc63c7769ad252df853e
parent d212e6203ab44e56c4cc32486810a31b8fc77ef7

VertexDataManager now supports direct buffers when vertex conversion is not needed.

TRAC #22297

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1886 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/renderer/InputLayoutCache.cpp

diff --git a/src/libGLESv2/renderer/InputLayoutCache.cpp b/src/libGLESv2/renderer/InputLayoutCache.cpp
index 8e76cec..6bef612 100644
--- a/src/libGLESv2/renderer/InputLayoutCache.cpp
+++ b/src/libGLESv2/renderer/InputLayoutCache.cpp
@@ -9,6 +9,7 @@
 
 #include "libGLESv2/renderer/InputLayoutCache.h"
 #include "libGLESv2/renderer/VertexBuffer11.h"
+#include "libGLESv2/renderer/BufferStorage11.h"
 #include "libGLESv2/renderer/ShaderExecutable11.h"
 #include "libGLESv2/ProgramBinary.h"
 
@@ -69,6 +70,7 @@
         if (attributes[i].active)
         {
             VertexBuffer11 *vertexBuffer = VertexBuffer11::makeVertexBuffer11(attributes[i].vertexBuffer);
+            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;
 
@@ -81,7 +83,7 @@
             ilKey.elements[ilKey.elementCount].InstanceDataStepRate = attributes[i].divisor;
             ilKey.elementCount++;
 
-            vertexBuffers[i] = vertexBuffer->getBuffer();
+            vertexBuffers[i] = bufferStorage ? bufferStorage->getBuffer() : vertexBuffer->getBuffer();
             vertexStrides[i] = attributes[i].stride;
             vertexOffsets[i] = attributes[i].offset;
         }