Henri Verbeet : wined3d: If a stage isn't mapped to a texture unit, we can' t set default coordinates either.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2c1e4602a365d51fe3411333e9aabdff2aaa440d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2c1e4602a365d51fe3411333e9...

Author: Henri Verbeet 
Date:   Wed Sep 24 15:56:48 2008 +0200

wined3d: If a stage isn't mapped to a texture unit, we can't set default coordinates either.

---

dlls/wined3d/drawprim.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index c4154a7..1700718 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -437,6 +437,8 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
                     continue;
                 }

+                if (texture_idx == -1) continue;
+
                 ptrToCoords = (float *)(texCoords[coordIdx] + (SkipnStrides * sd->u.s.texCoords[coordIdx].dwStride));
                 if (texCoords[coordIdx] == NULL) {
                     TRACE("tex: %d - Skipping tex coords, as no data supplied\n", textureNo);
@@ -449,8 +451,6 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
                 } else {
                     int coordsToUse = sd->u.s.texCoords[coordIdx].dwType + 1; /* 0 == WINED3DDECLTYPE_FLOAT1 etc */

-                    if (texture_idx == -1) continue;
-
                     /* The coords to supply depend completely on the fvf / vertex shader */
                     switch (coordsToUse) {
                     case 4: q = ptrToCoords[3]; /* drop through */