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

ddraw: Matrix values in the execute buffer are handles.

This commit is contained in:
Stefan Dösinger 2006-06-29 14:15:03 +02:00 committed by Alexandre Julliard
parent 97c350b438
commit 44ace22445
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/ddraw/device.c
View File

@ -1232,8 +1232,8 @@ IDirect3DDeviceImpl_1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE *D3DM
HeapFree(GetProcessHeap(), 0, Matrix); HeapFree(GetProcessHeap(), 0, Matrix);
return DDERR_OUTOFMEMORY; return DDERR_OUTOFMEMORY;
} }
This->Handles[(DWORD) D3DMatHandle - 1].ptr = Matrix; This->Handles[(DWORD) *D3DMatHandle - 1].ptr = Matrix;
This->Handles[(DWORD) D3DMatHandle - 1].type = DDrawHandle_Matrix; This->Handles[(DWORD) *D3DMatHandle - 1].type = DDrawHandle_Matrix;
TRACE(" returning matrix handle %ld\n", *D3DMatHandle); TRACE(" returning matrix handle %ld\n", *D3DMatHandle);
return D3D_OK; return D3D_OK;

41
dlls/ddraw/executebuffer.c
View File

@ -192,16 +192,26 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
LPD3DMATRIXMULTIPLY ci = (LPD3DMATRIXMULTIPLY) instr; LPD3DMATRIXMULTIPLY ci = (LPD3DMATRIXMULTIPLY) instr;
LPD3DMATRIX a = (LPD3DMATRIX) ci->hDestMatrix; LPD3DMATRIX a, b, c;
LPD3DMATRIX b = (LPD3DMATRIX) ci->hSrcMatrix1;
LPD3DMATRIX c = (LPD3DMATRIX) ci->hSrcMatrix2;
TRACE(" Dest : %08lx Src1 : %08lx Src2 : %08lx\n",
ci->hDestMatrix, ci->hSrcMatrix1, ci->hSrcMatrix2);
multiply_matrix(a,c,b);
instr += size; if(!ci->hDestMatrix || ci->hDestMatrix > lpDevice->numHandles ||
!ci->hSrcMatrix1 || ci->hSrcMatrix1 > lpDevice->numHandles ||
!ci->hSrcMatrix2 || ci->hSrcMatrix2 > lpDevice->numHandles) {
ERR("Handles out of bounds\n");
} else if (lpDevice->Handles[ci->hDestMatrix - 1].type != DDrawHandle_Matrix ||
lpDevice->Handles[ci->hSrcMatrix1 - 1].type != DDrawHandle_Matrix ||
lpDevice->Handles[ci->hSrcMatrix2 - 1].type != DDrawHandle_Matrix) {
ERR("Handle types invalid\n");
} else {
a = (LPD3DMATRIX) lpDevice->Handles[ci->hDestMatrix - 1].ptr;
b = (LPD3DMATRIX) lpDevice->Handles[ci->hSrcMatrix1 - 1].ptr;
c = (LPD3DMATRIX) lpDevice->Handles[ci->hSrcMatrix2 - 1].ptr;
TRACE(" Dest : %p Src1 : %p Src2 : %p\n",
a, b, c);
multiply_matrix(a,c,b);
}
instr += size;
} }
} break; } break;
@ -212,9 +222,16 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
LPD3DSTATE ci = (LPD3DSTATE) instr; LPD3DSTATE ci = (LPD3DSTATE) instr;
IDirect3DDevice7_SetTransform(ICOM_INTERFACE(lpDevice, IDirect3DDevice7), if(!ci->u2.dwArg[0]) {
ci->u1.drstRenderStateType, (LPD3DMATRIX)ci->u2.dwArg[0]); ERR("Setting a NULL matrix handle, what should I do?\n");
} else if(ci->u2.dwArg[0] > lpDevice->numHandles) {
ERR("Handle %ld is out of bounds\n", ci->u2.dwArg[0]);
} else if(lpDevice->Handles[ci->u2.dwArg[0] - 1].type != DDrawHandle_Matrix) {
ERR("Handle %ld is not a matrix handle\n", ci->u2.dwArg[0]);
} else {
IDirect3DDevice7_SetTransform(ICOM_INTERFACE(lpDevice, IDirect3DDevice7),
ci->u1.drstRenderStateType, (LPD3DMATRIX) lpDevice->Handles[ci->u2.dwArg[0] - 1].ptr);
}
instr += size; instr += size;
} }
} break; } break;