Skip to content

A
angle
Commit 0979e7aa by Jamie Madill
Options

Fix D3D9 short attributes to int component type.

In the component type lexicon, we only use float/int/uint/norm, and we were marking the D3D9 short vertex attributes as short. This fixes the WebGL Test gl-vertexattribpointer-offsets. BUG=angle:550 Change-Id: I3853df8bad5c98b8d0986bfa4ea73d254264ad56 Reviewed-on: https://chromium-review.googlesource.com/191950Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 1e194d31
Showing with 2 additions and 2 deletions
src/libGLESv2/renderer/d3d9/formatutils9.cpp
...@@ -463,8 +463,8 @@ GLenum GetDeclTypeComponentType(D3DDECLTYPE declType) ...@@ -463,8 +463,8 @@ GLenum GetDeclTypeComponentType(D3DDECLTYPE declType)
case D3DDECLTYPE_FLOAT3: return GL_FLOAT; case D3DDECLTYPE_FLOAT3: return GL_FLOAT;
case D3DDECLTYPE_FLOAT4: return GL_FLOAT; case D3DDECLTYPE_FLOAT4: return GL_FLOAT;
case D3DDECLTYPE_UBYTE4: return GL_UNSIGNED_INT; case D3DDECLTYPE_UBYTE4: return GL_UNSIGNED_INT;
case D3DDECLTYPE_SHORT2: return GL_SHORT; case D3DDECLTYPE_SHORT2: return GL_INT;
case D3DDECLTYPE_SHORT4: return GL_SHORT; case D3DDECLTYPE_SHORT4: return GL_INT;
case D3DDECLTYPE_UBYTE4N: return GL_UNSIGNED_NORMALIZED; case D3DDECLTYPE_UBYTE4N: return GL_UNSIGNED_NORMALIZED;
case D3DDECLTYPE_SHORT4N: return GL_SIGNED_NORMALIZED; case D3DDECLTYPE_SHORT4N: return GL_SIGNED_NORMALIZED;
case D3DDECLTYPE_USHORT4N: return GL_UNSIGNED_NORMALIZED; case D3DDECLTYPE_USHORT4N: return GL_UNSIGNED_NORMALIZED;
......
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