[01/10] wined3d: Use WINED3DSTREAMSOURCE_INSTANCEDATA rather than
D3DSTREAMSOURCE_INSTANCEDATA
H. Verbeet
hverbeet at gmail.com
Wed Feb 14 16:30:16 CST 2007
This set of patches applies on top of Stefan's patches sent today. The
idea is to get rid of the dependency on d3d9.h in wined3d.
Changelog:
- Use WINED3DSTREAMSOURCE_INSTANCEDATA rather than
D3DSTREAMSOURCE_INSTANCEDATA
-------------- next part --------------
---
dlls/wined3d/drawprim.c | 4 ++--
dlls/wined3d/state.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index 1d2a66e..2cc3a15 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -1182,7 +1182,7 @@ inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVertexStride
/* First, figure out how many instances we have to draw */
for(i = 0; i < MAX_STREAMS; i++) {
/* Look at all non-instanced streams */
- if(!(stateblock->streamFlags[i] & D3DSTREAMSOURCE_INSTANCEDATA) &&
+ if(!(stateblock->streamFlags[i] & WINED3DSTREAMSOURCE_INSTANCEDATA) &&
stateblock->streamSource[i]) {
int inst = stateblock->streamFreq[i];
@@ -1194,7 +1194,7 @@ inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVertexStride
}
for(i = 0; i < sizeof(sd->u.input) / sizeof(sd->u.input[0]); i++) {
- if(stateblock->streamFlags[sd->u.input[i].streamNo] & D3DSTREAMSOURCE_INSTANCEDATA) {
+ if(stateblock->streamFlags[sd->u.input[i].streamNo] & WINED3DSTREAMSOURCE_INSTANCEDATA) {
instancedData[numInstancedAttribs] = i;
numInstancedAttribs++;
}
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 808d478..e35b0d4 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -2155,7 +2155,7 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, WineDi
continue;
/* Do not load instance data. It will be specified using glTexCoord by drawprim */
- if(stateblock->streamFlags[strided->u.input[i].streamNo] & D3DSTREAMSOURCE_INSTANCEDATA) {
+ if(stateblock->streamFlags[strided->u.input[i].streamNo] & WINED3DSTREAMSOURCE_INSTANCEDATA) {
GL_EXTCALL(glDisableVertexAttribArrayARB(i));
stateblock->wineD3DDevice->instancedDraw = TRUE;
continue;
More information about the wine-patches
mailing list