Skip to content

A
angle
Commit 6f4423af by Shannon Woods
Options

Revert "Fix application of vertex divisor for non-instanced draws in D3D9"

Other issues turn up on the FYI bots with this patch applied; reverting until this is investigated further. This reverts commit 9f6907bf. Change-Id: Ib30c51b2c905e87973c73b06baa4b8ebba31d210 Reviewed-on: https://chromium-review.googlesource.com/211683Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Tested-by: 's avatarShannon Woods <shannonwoods@chromium.org>
parent 9f6907bf
Showing with 0 additions and 14 deletions
src/libGLESv2/renderer/d3d/d3d9/VertexDeclarationCache.cpp
...@@ -48,20 +48,6 @@ GLenum VertexDeclarationCache::applyDeclaration(IDirect3DDevice9 *device, Transl ...@@ -48,20 +48,6 @@ GLenum VertexDeclarationCache::applyDeclaration(IDirect3DDevice9 *device, Transl
int indexedAttribute = gl::MAX_VERTEX_ATTRIBS; int indexedAttribute = gl::MAX_VERTEX_ATTRIBS;
int instancedAttribute = gl::MAX_VERTEX_ATTRIBS; int instancedAttribute = gl::MAX_VERTEX_ATTRIBS;
if (instances == 0)
{
for (int i = 0; i < gl::MAX_VERTEX_ATTRIBS; ++i)
{
if (attributes[i].divisor != 0)
{
// If a divisor is set, it still applies even if an instanced draw was not used, so treat
// as a single-instance draw.
instances = 1;
break;
}
}
}
if (instances > 0) if (instances > 0)
{ {
// Find an indexed attribute to be mapped to D3D stream 0 // Find an indexed attribute to be mapped to D3D stream 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment