ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Improve drawStridedInstanced().

Browse Source
This commit is contained in:
Rico Schüller 2008-04-06 18:50:52 +02:00 committed by Alexandre Julliard
parent 73d98ccd4e
commit a44da70d63
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/wined3d/drawprim.c
View File

@ -838,15 +838,15 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVerte
/* First, figure out how many instances we have to draw */ /* First, figure out how many instances we have to draw */
for(i = 0; i < MAX_STREAMS; i++) { for(i = 0; i < MAX_STREAMS; i++) {
/* Look at all non-instanced streams */ /* Look at the streams and take the first one which matches */
if(!(stateblock->streamFlags[i] & WINED3DSTREAMSOURCE_INSTANCEDATA) && if(((stateblock->streamFlags[i] & WINED3DSTREAMSOURCE_INSTANCEDATA) || (stateblock->streamFlags[i] & WINED3DSTREAMSOURCE_INDEXEDDATA)) && stateblock->streamSource[i]) {
stateblock->streamSource[i]) { /* D3d9 could set StreamFreq 0 with (INSTANCEDATA or INDEXEDDATA) and then it is handled as 1. See d3d9/tests/visual.c-> stream_test() */
int inst = stateblock->streamFreq[i]; if(stateblock->streamFreq[i] == 0){
numInstances = 1;
if(numInstances && inst != numInstances) { } else {
ERR("Two streams specify a different number of instances. Got %d, new is %d\n", numInstances, inst); numInstances = stateblock->streamFreq[i]; /* use the specified number of instances from the first matched stream. See d3d9/tests/visual.c-> stream_test() */
} }
numInstances = inst; break; /* break, bacause only the first suitable value is interesting */
} }
} }