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
293f362d
Commit
293f362d
authored
Jan 04, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Jan 04, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Avoid LPD3DMATRIX.
parent
1adda4cf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
14 deletions
+12
-14
ddraw_private.h
dlls/ddraw/ddraw_private.h
+1
-3
d3d.h
include/d3d.h
+11
-11
No files found.
dlls/ddraw/ddraw_private.h
View file @
293f362d
...
...
@@ -563,9 +563,7 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel) DECLSPEC_HIDDEN;
void
DDSD_to_DDSD2
(
const
DDSURFACEDESC
*
in
,
DDSURFACEDESC2
*
out
)
DECLSPEC_HIDDEN
;
void
DDSD2_to_DDSD
(
const
DDSURFACEDESC2
*
in
,
DDSURFACEDESC
*
out
)
DECLSPEC_HIDDEN
;
/* This only needs to be here as long the processvertices functionality of
* IDirect3DExecuteBuffer isn't in WineD3D */
void
multiply_matrix
(
LPD3DMATRIX
dest
,
const
D3DMATRIX
*
src1
,
const
D3DMATRIX
*
src2
)
DECLSPEC_HIDDEN
;
void
multiply_matrix
(
D3DMATRIX
*
dst
,
const
D3DMATRIX
*
src1
,
const
D3DMATRIX
*
src2
)
DECLSPEC_HIDDEN
;
/* Used for generic dumping */
struct
flag_info
...
...
include/d3d.h
View file @
293f362d
...
...
@@ -953,8 +953,8 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown)
STDMETHOD
(
GetPickRecords
)(
THIS_
LPDWORD
lpCount
,
LPD3DPICKRECORD
lpD3DPickRec
)
PURE
;
STDMETHOD
(
EnumTextureFormats
)(
THIS_
LPD3DENUMTEXTUREFORMATSCALLBACK
lpD3DEnumTextureProc
,
LPVOID
lpArg
)
PURE
;
STDMETHOD
(
CreateMatrix
)(
THIS_
D3DMATRIXHANDLE
*
matrix
)
PURE
;
STDMETHOD
(
SetMatrix
)(
THIS_
D3DMATRIXHANDLE
D3DMatHandle
,
LPD3DMATRIX
lpD3DM
atrix
)
PURE
;
STDMETHOD
(
GetMatrix
)(
THIS_
D3DMATRIXHANDLE
D3DMatHandle
,
LPD3DMATRIX
lpD3DM
atrix
)
PURE
;
STDMETHOD
(
SetMatrix
)(
THIS_
D3DMATRIXHANDLE
handle
,
D3DMATRIX
*
m
atrix
)
PURE
;
STDMETHOD
(
GetMatrix
)(
THIS_
D3DMATRIXHANDLE
handle
,
D3DMATRIX
*
m
atrix
)
PURE
;
STDMETHOD
(
DeleteMatrix
)(
THIS_
D3DMATRIXHANDLE
D3DMatHandle
)
PURE
;
STDMETHOD
(
BeginScene
)(
THIS
)
PURE
;
STDMETHOD
(
EndScene
)(
THIS
)
PURE
;
...
...
@@ -1051,9 +1051,9 @@ DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown)
STDMETHOD
(
SetRenderState
)(
THIS_
D3DRENDERSTATETYPE
dwRenderStateType
,
DWORD
dwRenderState
)
PURE
;
STDMETHOD
(
GetLightState
)(
THIS_
D3DLIGHTSTATETYPE
dwLightStateType
,
LPDWORD
lpdwLightState
)
PURE
;
STDMETHOD
(
SetLightState
)(
THIS_
D3DLIGHTSTATETYPE
dwLightStateType
,
DWORD
dwLightState
)
PURE
;
STDMETHOD
(
SetTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
dtstTransformStateType
,
LPD3DMATRIX
lpD3DM
atrix
)
PURE
;
STDMETHOD
(
GetTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
dtstTransformStateType
,
LPD3DMATRIX
lpD3DM
atrix
)
PURE
;
STDMETHOD
(
MultiplyTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
dtstTransformStateType
,
LPD3DMATRIX
lpD3DM
atrix
)
PURE
;
STDMETHOD
(
SetTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
state
,
D3DMATRIX
*
m
atrix
)
PURE
;
STDMETHOD
(
GetTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
state
,
D3DMATRIX
*
m
atrix
)
PURE
;
STDMETHOD
(
MultiplyTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
state
,
D3DMATRIX
*
m
atrix
)
PURE
;
STDMETHOD
(
DrawPrimitive
)(
THIS_
D3DPRIMITIVETYPE
d3dptPrimitiveType
,
D3DVERTEXTYPE
d3dvtVertexType
,
LPVOID
lpvVertices
,
DWORD
dwVertexCount
,
DWORD
dwFlags
)
PURE
;
STDMETHOD
(
DrawIndexedPrimitive
)(
THIS_
D3DPRIMITIVETYPE
d3dptPrimitiveType
,
D3DVERTEXTYPE
d3dvtVertexType
,
LPVOID
lpvVertices
,
DWORD
dwVertexCount
,
LPWORD
dwIndices
,
DWORD
dwIndexCount
,
DWORD
dwFlags
)
PURE
;
STDMETHOD
(
SetClipStatus
)(
THIS_
LPD3DCLIPSTATUS
lpD3DClipStatus
)
PURE
;
...
...
@@ -1170,9 +1170,9 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown)
STDMETHOD
(
SetRenderState
)(
THIS_
D3DRENDERSTATETYPE
dwRenderStateType
,
DWORD
dwRenderState
)
PURE
;
STDMETHOD
(
GetLightState
)(
THIS_
D3DLIGHTSTATETYPE
dwLightStateType
,
LPDWORD
lpdwLightState
)
PURE
;
STDMETHOD
(
SetLightState
)(
THIS_
D3DLIGHTSTATETYPE
dwLightStateType
,
DWORD
dwLightState
)
PURE
;
STDMETHOD
(
SetTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
dtstTransformStateType
,
LPD3DMATRIX
lpD3DM
atrix
)
PURE
;
STDMETHOD
(
GetTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
dtstTransformStateType
,
LPD3DMATRIX
lpD3DM
atrix
)
PURE
;
STDMETHOD
(
MultiplyTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
dtstTransformStateType
,
LPD3DMATRIX
lpD3DM
atrix
)
PURE
;
STDMETHOD
(
SetTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
state
,
D3DMATRIX
*
m
atrix
)
PURE
;
STDMETHOD
(
GetTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
state
,
D3DMATRIX
*
m
atrix
)
PURE
;
STDMETHOD
(
MultiplyTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
state
,
D3DMATRIX
*
m
atrix
)
PURE
;
STDMETHOD
(
DrawPrimitive
)(
THIS_
D3DPRIMITIVETYPE
d3dptPrimitiveType
,
DWORD
d3dvtVertexType
,
LPVOID
lpvVertices
,
DWORD
dwVertexCount
,
DWORD
dwFlags
)
PURE
;
STDMETHOD
(
DrawIndexedPrimitive
)(
THIS_
D3DPRIMITIVETYPE
d3dptPrimitiveType
,
DWORD
d3dvtVertexType
,
LPVOID
lpvVertices
,
DWORD
dwVertexCount
,
LPWORD
dwIndices
,
DWORD
dwIndexCount
,
DWORD
dwFlags
)
PURE
;
STDMETHOD
(
SetClipStatus
)(
THIS_
LPD3DCLIPSTATUS
lpD3DClipStatus
)
PURE
;
...
...
@@ -1304,10 +1304,10 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown)
STDMETHOD
(
SetRenderTarget
)(
THIS_
IDirectDrawSurface7
*
surface
,
DWORD
flags
)
PURE
;
STDMETHOD
(
GetRenderTarget
)(
THIS_
IDirectDrawSurface7
**
surface
)
PURE
;
STDMETHOD
(
Clear
)(
THIS_
DWORD
count
,
D3DRECT
*
rects
,
DWORD
flags
,
D3DCOLOR
color
,
D3DVALUE
z
,
DWORD
stencil
)
PURE
;
STDMETHOD
(
SetTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
dtstTransformStateType
,
LPD3DMATRIX
lpD3DM
atrix
)
PURE
;
STDMETHOD
(
GetTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
dtstTransformStateType
,
LPD3DMATRIX
lpD3DM
atrix
)
PURE
;
STDMETHOD
(
SetTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
state
,
D3DMATRIX
*
m
atrix
)
PURE
;
STDMETHOD
(
GetTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
state
,
D3DMATRIX
*
m
atrix
)
PURE
;
STDMETHOD
(
SetViewport
)(
THIS_
LPD3DVIEWPORT7
lpData
)
PURE
;
STDMETHOD
(
MultiplyTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
dtstTransformStateType
,
LPD3DMATRIX
lpD3DM
atrix
)
PURE
;
STDMETHOD
(
MultiplyTransform
)(
THIS_
D3DTRANSFORMSTATETYPE
state
,
D3DMATRIX
*
m
atrix
)
PURE
;
STDMETHOD
(
GetViewport
)(
THIS_
LPD3DVIEWPORT7
lpData
)
PURE
;
STDMETHOD
(
SetMaterial
)(
THIS_
LPD3DMATERIAL7
lpMat
)
PURE
;
STDMETHOD
(
GetMaterial
)(
THIS_
LPD3DMATERIAL7
lpMat
)
PURE
;
...
...
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