Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
44ace224
Commit
44ace224
authored
Jun 29, 2006
by
Stefan Dösinger
Committed by
Alexandre Julliard
Jun 30, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Matrix values in the execute buffer are handles.
parent
97c350b4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
14 deletions
+31
-14
device.c
dlls/ddraw/device.c
+2
-2
executebuffer.c
dlls/ddraw/executebuffer.c
+29
-12
No files found.
dlls/ddraw/device.c
View file @
44ace224
...
...
@@ -1232,8 +1232,8 @@ IDirect3DDeviceImpl_1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE *D3DM
HeapFree
(
GetProcessHeap
(),
0
,
Matrix
);
return
DDERR_OUTOFMEMORY
;
}
This
->
Handles
[(
DWORD
)
D3DMatHandle
-
1
].
ptr
=
Matrix
;
This
->
Handles
[(
DWORD
)
D3DMatHandle
-
1
].
type
=
DDrawHandle_Matrix
;
This
->
Handles
[(
DWORD
)
*
D3DMatHandle
-
1
].
ptr
=
Matrix
;
This
->
Handles
[(
DWORD
)
*
D3DMatHandle
-
1
].
type
=
DDrawHandle_Matrix
;
TRACE
(
" returning matrix handle %ld
\n
"
,
*
D3DMatHandle
);
return
D3D_OK
;
...
...
dlls/ddraw/executebuffer.c
View file @
44ace224
...
...
@@ -192,16 +192,26 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
for
(
i
=
0
;
i
<
count
;
i
++
)
{
LPD3DMATRIXMULTIPLY
ci
=
(
LPD3DMATRIXMULTIPLY
)
instr
;
LPD3DMATRIX
a
=
(
LPD3DMATRIX
)
ci
->
hDestMatrix
;
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
);
LPD3DMATRIX
a
,
b
,
c
;
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
;
instr
+=
size
;
}
}
break
;
...
...
@@ -212,9 +222,16 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
for
(
i
=
0
;
i
<
count
;
i
++
)
{
LPD3DSTATE
ci
=
(
LPD3DSTATE
)
instr
;
IDirect3DDevice7_SetTransform
(
ICOM_INTERFACE
(
lpDevice
,
IDirect3DDevice7
),
ci
->
u1
.
drstRenderStateType
,
(
LPD3DMATRIX
)
ci
->
u2
.
dwArg
[
0
]);
if
(
!
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
;
}
}
break
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment