From: Patrick Rudolph <s...@das-labor.org> Add returncode E_FAIL. Return E_FAIL for any vertexdeclaration element with type unused.
Reviewed-by: Axel Davy <axel.d...@ens.fr> Signed-off-by: Patrick Rudolph <s...@das-labor.org> --- include/D3D9/d3d9types.h | 1 + src/gallium/state_trackers/nine/vertexdeclaration9.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/D3D9/d3d9types.h b/include/D3D9/d3d9types.h index e0f1e72..5020934 100644 --- a/include/D3D9/d3d9types.h +++ b/include/D3D9/d3d9types.h @@ -50,6 +50,7 @@ #define E_OUTOFMEMORY MAKE_HRESULT(1, 0x007, 14) #define E_NOINTERFACE MAKE_HRESULT(1, 0x000, 0x4002) #define E_POINTER MAKE_HRESULT(1, 0x000, 0x4003) +#define E_FAIL MAKE_HRESULT(1, 0x000, 0x4005) #define S_OK ((HRESULT)0) #define S_FALSE ((HRESULT)1) diff --git a/src/gallium/state_trackers/nine/vertexdeclaration9.c b/src/gallium/state_trackers/nine/vertexdeclaration9.c index 08b95e2..49e5937 100644 --- a/src/gallium/state_trackers/nine/vertexdeclaration9.c +++ b/src/gallium/state_trackers/nine/vertexdeclaration9.c @@ -181,10 +181,11 @@ NineVertexDeclaration9_ctor( struct NineVertexDeclaration9 *This, HRESULT hr = NineUnknown_ctor(&This->base, pParams); if (FAILED(hr)) { return hr; } + /* wine */ for (This->nelems = 0; - pElements[This->nelems].Type != D3DDECLTYPE_UNUSED && - pElements[This->nelems].Stream != 0xFF; /* wine */ - ++This->nelems); + pElements[This->nelems].Stream != 0xFF; + ++This->nelems) + user_assert(pElements[This->nelems].Type != D3DDECLTYPE_UNUSED, E_FAIL); caps = NineDevice9_GetCaps(This->base.device); user_assert(This->nelems <= caps->MaxStreams, D3DERR_INVALIDCALL); -- 2.1.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev