Ivan Gyurdiev : wined3d: Add D3DSTREAMSOURCE codes to the WINED3D namespace .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4c723a76622204b97b97a13f926dccaca73b14de
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4c723a76622204b97b97a13f92...

Author: Ivan Gyurdiev 
Date:   Tue Oct 31 03:19:13 2006 -0500

wined3d: Add D3DSTREAMSOURCE codes to the WINED3D namespace.

---

dlls/wined3d/device.c          |   18 +++++++++---------
 dlls/wined3d/wined3d_private.h |    2 +-
 include/wine/wined3d_types.h   |    4 ++++
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 7eb1a60..8ae51fb 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2368,17 +2368,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl
     /* D3d9 only, but shouldn't  hurt d3d8 */
     UINT streamFlags;

-    streamFlags = StreamNumber &(D3DSTREAMSOURCE_INDEXEDDATA | D3DSTREAMSOURCE_INSTANCEDATA);
+    streamFlags = StreamNumber &(WINED3DSTREAMSOURCE_INDEXEDDATA | WINED3DSTREAMSOURCE_INSTANCEDATA);
     if (streamFlags) {
-        if (streamFlags & D3DSTREAMSOURCE_INDEXEDDATA) {
+        if (streamFlags & WINED3DSTREAMSOURCE_INDEXEDDATA) {
            FIXME("stream index data not supported\n");
         }
-        if (streamFlags & D3DSTREAMSOURCE_INDEXEDDATA) {
+        if (streamFlags & WINED3DSTREAMSOURCE_INDEXEDDATA) {
            FIXME("stream instance data not supported\n");
         }
     }

-    StreamNumber&= ~(D3DSTREAMSOURCE_INDEXEDDATA | D3DSTREAMSOURCE_INSTANCEDATA);
+    StreamNumber&= ~(WINED3DSTREAMSOURCE_INDEXEDDATA | WINED3DSTREAMSOURCE_INSTANCEDATA);

if (StreamNumber >= MAX_STREAMS) {
         WARN("Stream out of range %d\n", StreamNumber);
@@ -2434,17 +2434,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl
            This->stateBlock->streamSource[StreamNumber], This->stateBlock->streamStride[StreamNumber]);

-    streamFlags = StreamNumber &(D3DSTREAMSOURCE_INDEXEDDATA | D3DSTREAMSOURCE_INSTANCEDATA);
+    streamFlags = StreamNumber &(WINED3DSTREAMSOURCE_INDEXEDDATA | WINED3DSTREAMSOURCE_INSTANCEDATA);
     if (streamFlags) {
-        if (streamFlags & D3DSTREAMSOURCE_INDEXEDDATA) {
+        if (streamFlags & WINED3DSTREAMSOURCE_INDEXEDDATA) {
            FIXME("stream index data not supported\n");
         }
-        if (streamFlags & D3DSTREAMSOURCE_INDEXEDDATA) {
+        if (streamFlags & WINED3DSTREAMSOURCE_INDEXEDDATA) {
             FIXME("stream instance data not supported\n");
         }
     }

-    StreamNumber&= ~(D3DSTREAMSOURCE_INDEXEDDATA | D3DSTREAMSOURCE_INSTANCEDATA);
+    StreamNumber&= ~(WINED3DSTREAMSOURCE_INDEXEDDATA | WINED3DSTREAMSOURCE_INSTANCEDATA);

if (StreamNumber >= MAX_STREAMS) {
         WARN("Stream out of range %d\n", StreamNumber);
@@ -2479,7 +2479,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
     IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;

TRACE("(%p) StreamNumber(%d), Divider(%d)\n", This, StreamNumber, Divider);
-    This->updateStateBlock->streamFlags[StreamNumber] = Divider & (D3DSTREAMSOURCE_INSTANCEDATA  | D3DSTREAMSOURCE_INDEXEDDATA );
+    This->updateStateBlock->streamFlags[StreamNumber] = Divider & (WINED3DSTREAMSOURCE_INSTANCEDATA  | WINED3DSTREAMSOURCE_INDEXEDDATA );

This->updateStateBlock->changed.streamFreq[StreamNumber]  = TRUE;
     This->updateStateBlock->set.streamFreq[StreamNumber]      = TRUE;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 4d38f5c..1d8bb10 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1102,7 +1102,7 @@ struct IWineD3DStateBlockImpl
     UINT                      streamOffset[MAX_STREAMS];
     IWineD3DVertexBuffer     *streamSource[MAX_STREAMS];
     UINT                      streamFreq[MAX_STREAMS];
-    UINT                      streamFlags[MAX_STREAMS];     /*0 | D3DSTREAMSOURCE_INSTANCEDATA | D3DSTREAMSOURCE_INDEXEDDATA  */
+    UINT                      streamFlags[MAX_STREAMS];     /*0 | WINED3DSTREAMSOURCE_INSTANCEDATA | WINED3DSTREAMSOURCE_INDEXEDDATA  */

/* Indices */
     IWineD3DIndexBuffer*      pIndexData;
diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h
index 48613e3..9e26550 100644
--- a/include/wine/wined3d_types.h
+++ b/include/wine/wined3d_types.h
@@ -1533,4 +1533,8 @@ #define WINED3DCLEAR_TARGET   0x00000001
 #define WINED3DCLEAR_ZBUFFER  0x00000002
 #define WINED3DCLEAR_STENCIL  0x00000004

+/* Stream source flags */
+#define WINED3DSTREAMSOURCE_INDEXEDDATA  (1 << 30)
+#define WINED3DSTREAMSOURCE_INSTANCEDATA (2 << 30)
+
 #endif