commit c52be63dba2e6297fc480124330f8f24e706c998
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 21:04:28 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 21:04:28 2012 +0000
tree b664d91d92d807bc1221c2b83329dc041e6692e6
parent 7b18d0c45c43e19d2501a33f7f3c5bb66bf91f36

Apply the input topology.

TRAC #22151
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens

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

src/libGLESv2/renderer/Renderer11.cpp

diff --git a/src/libGLESv2/renderer/Renderer11.cpp b/src/libGLESv2/renderer/Renderer11.cpp
index 3dd1612..41e6fc7 100644
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -474,22 +474,22 @@
 
 bool Renderer11::applyPrimitiveType(GLenum mode, GLsizei count)
 {
-    mPrimitiveTopology = D3D_PRIMITIVE_TOPOLOGY_UNDEFINED;
+    D3D11_PRIMITIVE_TOPOLOGY primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_UNDEFINED;
 
     switch (mode)
     {
-      case GL_POINTS:         mPrimitiveTopology = D3D11_PRIMITIVE_TOPOLOGY_POINTLIST;   break;
-      case GL_LINES:          mPrimitiveTopology = D3D_PRIMITIVE_TOPOLOGY_LINELIST;      break;
+      case GL_POINTS:         primitiveTopology = D3D11_PRIMITIVE_TOPOLOGY_POINTLIST;   break;
+      case GL_LINES:          primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_LINELIST;      break;
       case GL_LINE_LOOP:      UNIMPLEMENTED();   /* TODO */                              break;
-      case GL_LINE_STRIP:     mPrimitiveTopology = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP;     break;
-      case GL_TRIANGLES:      mPrimitiveTopology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST;  break;
-      case GL_TRIANGLE_STRIP: mPrimitiveTopology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP; break;
+      case GL_LINE_STRIP:     primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_LINESTRIP;     break;
+      case GL_TRIANGLES:      primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST;  break;
+      case GL_TRIANGLE_STRIP: primitiveTopology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP; break;
       case GL_TRIANGLE_FAN:   UNIMPLEMENTED();   /* TODO */                              break;
       default:
         return error(GL_INVALID_ENUM, false);
     }
 
-    mVertexCount = count;
+    mDeviceContext->IASetPrimitiveTopology(primitiveTopology);
 
     return count > 0;
 }

src/libGLESv2/renderer/Renderer11.h

diff --git a/src/libGLESv2/renderer/Renderer11.h b/src/libGLESv2/renderer/Renderer11.h
index 69b07fa..58fd00d 100644
--- a/src/libGLESv2/renderer/Renderer11.h
+++ b/src/libGLESv2/renderer/Renderer11.h
@@ -192,9 +192,6 @@
     float mCurNear;
     float mCurFar;
 
-    D3D11_PRIMITIVE_TOPOLOGY mPrimitiveTopology;
-    UINT mVertexCount;
-
     ID3D11Device *mDevice;
     D3D_FEATURE_LEVEL mFeatureLevel;
     ID3D11DeviceContext *mDeviceContext;