Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
9628a1b2
Commit
9628a1b2
authored
Oct 12, 2006
by
Ivan Gyurdiev
Committed by
Alexandre Julliard
Oct 12, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Merge D3DRECT types into one type in WINED3D namespace.
parent
ac371631
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
25 additions
and
12 deletions
+25
-12
device.c
dlls/d3d8/device.c
+2
-1
device.c
dlls/d3d9/device.c
+6
-2
device.c
dlls/ddraw/device.c
+2
-1
device.c
dlls/wined3d/device.c
+4
-4
surface.c
dlls/wined3d/surface.c
+2
-2
wined3d_interface.h
include/wine/wined3d_interface.h
+2
-2
wined3d_types.h
include/wine/wined3d_types.h
+7
-0
No files found.
dlls/d3d8/device.c
View file @
9628a1b2
...
...
@@ -671,7 +671,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_Clear(LPDIRECT3DDEVICE8 iface, DWORD
IDirect3DDevice8Impl
*
This
=
(
IDirect3DDevice8Impl
*
)
iface
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
return
IWineD3DDevice_Clear
(
This
->
WineD3DDevice
,
Count
,
pRects
,
Flags
,
Color
,
Z
,
Stencil
);
/* Note: D3DRECT is compatible with WINED3DRECT */
return
IWineD3DDevice_Clear
(
This
->
WineD3DDevice
,
Count
,
(
CONST
WINED3DRECT
*
)
pRects
,
Flags
,
Color
,
Z
,
Stencil
);
}
static
HRESULT
WINAPI
IDirect3DDevice8Impl_SetTransform
(
LPDIRECT3DDEVICE8
iface
,
D3DTRANSFORMSTATETYPE
State
,
CONST
D3DMATRIX
*
lpMatrix
)
{
...
...
dlls/d3d9/device.c
View file @
9628a1b2
...
...
@@ -361,7 +361,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(LPDIRECT3DDEVICE9 iface,
IDirect3DDevice9Impl
*
This
=
(
IDirect3DDevice9Impl
*
)
iface
;
IDirect3DSurface9Impl
*
surface
=
(
IDirect3DSurface9Impl
*
)
pSurface
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
return
IWineD3DDevice_ColorFill
(
This
->
WineD3DDevice
,
surface
->
wineD3DSurface
,
(
CONST
D3DRECT
*
)
pRect
,
color
);
/* Note: D3DRECT is compatible with WINED3DRECT */
return
IWineD3DDevice_ColorFill
(
This
->
WineD3DDevice
,
surface
->
wineD3DSurface
,
(
CONST
WINED3DRECT
*
)
pRect
,
color
);
}
static
HRESULT
WINAPI
IDirect3DDevice9Impl_CreateOffscreenPlainSurface
(
LPDIRECT3DDEVICE9
iface
,
UINT
Width
,
UINT
Height
,
D3DFORMAT
Format
,
D3DPOOL
Pool
,
IDirect3DSurface9
**
ppSurface
,
HANDLE
*
pSharedHandle
)
{
...
...
@@ -458,7 +460,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_EndScene(LPDIRECT3DDEVICE9 iface) {
static
HRESULT
WINAPI
IDirect3DDevice9Impl_Clear
(
LPDIRECT3DDEVICE9
iface
,
DWORD
Count
,
CONST
D3DRECT
*
pRects
,
DWORD
Flags
,
D3DCOLOR
Color
,
float
Z
,
DWORD
Stencil
)
{
IDirect3DDevice9Impl
*
This
=
(
IDirect3DDevice9Impl
*
)
iface
;
TRACE
(
"(%p) Relay
\n
"
,
This
);
return
IWineD3DDevice_Clear
(
This
->
WineD3DDevice
,
Count
,
pRects
,
Flags
,
Color
,
Z
,
Stencil
);
/* Note: D3DRECT is compatible with WINED3DRECT */
return
IWineD3DDevice_Clear
(
This
->
WineD3DDevice
,
Count
,
(
CONST
WINED3DRECT
*
)
pRects
,
Flags
,
Color
,
Z
,
Stencil
);
}
static
HRESULT
WINAPI
IDirect3DDevice9Impl_SetTransform
(
LPDIRECT3DDEVICE9
iface
,
D3DTRANSFORMSTATETYPE
State
,
CONST
D3DMATRIX
*
lpMatrix
)
{
...
...
dlls/ddraw/device.c
View file @
9628a1b2
...
...
@@ -4031,7 +4031,8 @@ IDirect3DDeviceImpl_7_Clear(IDirect3DDevice7 *iface,
ICOM_THIS_FROM
(
IDirect3DDeviceImpl
,
IDirect3DDevice7
,
iface
);
TRACE
(
"(%p)->(%08x,%p,%08x,%08x,%f,%08x): Relay
\n
"
,
This
,
Count
,
Rects
,
Flags
,
(
DWORD
)
Color
,
Z
,
Stencil
);
return
IWineD3DDevice_Clear
(
This
->
wineD3DDevice
,
Count
,
Rects
,
Flags
,
Color
,
Z
,
Stencil
);
/* Note; D3DRECT is compatible with WINED3DRECT */
return
IWineD3DDevice_Clear
(
This
->
wineD3DDevice
,
Count
,
(
WINED3DRECT
*
)
Rects
,
Flags
,
Color
,
Z
,
Stencil
);
}
/*****************************************************************************
...
...
dlls/wined3d/device.c
View file @
9628a1b2
...
...
@@ -6021,7 +6021,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface,
return
WINED3D_OK
;
}
static
HRESULT
WINAPI
IWineD3DDeviceImpl_Clear
(
IWineD3DDevice
*
iface
,
DWORD
Count
,
CONST
D3DRECT
*
pRects
,
static
HRESULT
WINAPI
IWineD3DDeviceImpl_Clear
(
IWineD3DDevice
*
iface
,
DWORD
Count
,
CONST
WINE
D3DRECT
*
pRects
,
DWORD
Flags
,
D3DCOLOR
Color
,
float
Z
,
DWORD
Stencil
)
{
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
...
...
@@ -6034,7 +6034,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun
GLint
old_stencil_clear_value
;
GLfloat
old_color_clear_value
[
4
];
unsigned
int
i
;
CONST
D3DRECT
*
curRect
;
CONST
WINE
D3DRECT
*
curRect
;
TRACE
(
"(%p) Count (%d), pRects (%p), Flags (%x), Z (%f), Stencil (%d)
\n
"
,
This
,
Count
,
pRects
,
Flags
,
Z
,
Stencil
);
...
...
@@ -6108,7 +6108,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun
checkGLcall
(
"glClear"
);
/* Step to the next rectangle */
if
(
curRect
)
curRect
=
curRect
+
sizeof
(
D3DRECT
);
if
(
curRect
)
curRect
=
curRect
+
sizeof
(
WINE
D3DRECT
);
}
/* Restore the old values (why..?) */
...
...
@@ -6995,7 +6995,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DeletePatch(IWineD3DDevice *iface, UINT
return
WINED3D_OK
;
}
static
HRESULT
WINAPI
IWineD3DDeviceImpl_ColorFill
(
IWineD3DDevice
*
iface
,
IWineD3DSurface
*
pSurface
,
CONST
D3DRECT
*
pRect
,
D3DCOLOR
color
)
{
static
HRESULT
WINAPI
IWineD3DDeviceImpl_ColorFill
(
IWineD3DDevice
*
iface
,
IWineD3DSurface
*
pSurface
,
CONST
WINE
D3DRECT
*
pRect
,
D3DCOLOR
color
)
{
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
IWineD3DSurfaceImpl
*
surface
=
(
IWineD3DSurfaceImpl
*
)
pSurface
;
DDBLTFX
BltFx
;
...
...
dlls/wined3d/surface.c
View file @
9628a1b2
...
...
@@ -2237,7 +2237,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DS
/* Not called from the VTable */
static
HRESULT
IWineD3DSurfaceImpl_BltOverride
(
IWineD3DSurfaceImpl
*
This
,
RECT
*
DestRect
,
IWineD3DSurface
*
SrcSurface
,
RECT
*
SrcRect
,
DWORD
Flags
,
DDBLTFX
*
DDBltFx
)
{
D3DRECT
rect
;
WINE
D3DRECT
rect
;
IWineD3DDeviceImpl
*
myDevice
=
This
->
resource
.
wineD3DDevice
;
IWineD3DSwapChainImpl
*
swapchain
=
NULL
;
IWineD3DSurfaceImpl
*
Src
=
(
IWineD3DSurfaceImpl
*
)
SrcSurface
;
...
...
@@ -2580,7 +2580,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT *
if
(
(
(
IWineD3DSurface
*
)
This
!=
swapchain
->
frontBuffer
)
&&
(
swapchain
->
backBuffer
&&
(
IWineD3DSurface
*
)
This
!=
swapchain
->
backBuffer
[
0
])
)
{
UINT
row
;
D3DRECT
srect
;
WINE
D3DRECT
srect
;
float
xrel
,
yrel
;
TRACE
(
"Blt from rendertarget to texture
\n
"
);
...
...
include/wine/wined3d_interface.h
View file @
9628a1b2
...
...
@@ -447,7 +447,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase)
STDMETHOD
(
BeginScene
)(
THIS
)
PURE
;
STDMETHOD
(
EndScene
)(
THIS
)
PURE
;
STDMETHOD
(
Present
)(
THIS_
CONST
RECT
*
pSourceRect
,
CONST
RECT
*
pDestRect
,
HWND
hDestWindowOverride
,
CONST
RGNDATA
*
pDirtyRegion
)
PURE
;
STDMETHOD
(
Clear
)(
THIS_
DWORD
Count
,
CONST
D3DRECT
*
pRects
,
DWORD
Flags
,
D3DCOLOR
Color
,
float
Z
,
DWORD
Stencil
)
PURE
;
STDMETHOD
(
Clear
)(
THIS_
DWORD
Count
,
CONST
WINED3DRECT
*
pRects
,
DWORD
Flags
,
D3DCOLOR
Color
,
float
Z
,
DWORD
Stencil
)
PURE
;
STDMETHOD
(
DrawPrimitive
)(
THIS_
D3DPRIMITIVETYPE
PrimitiveType
,
UINT
StartVertex
,
UINT
PrimitiveCount
)
PURE
;
STDMETHOD
(
DrawIndexedPrimitive
)(
THIS_
D3DPRIMITIVETYPE
PrimitiveType
,
INT
baseVIdx
,
UINT
minIndex
,
UINT
NumVertices
,
UINT
startIndex
,
UINT
primCount
)
PURE
;
STDMETHOD
(
DrawPrimitiveUP
)(
THIS_
D3DPRIMITIVETYPE
PrimitiveType
,
UINT
PrimitiveCount
,
CONST
void
*
pVertexStreamZeroData
,
UINT
VertexStreamZeroStride
)
PURE
;
...
...
@@ -456,7 +456,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase)
STDMETHOD
(
DrawRectPatch
)(
THIS_
UINT
Handle
,
CONST
float
*
pNumSegs
,
CONST
WINED3DRECTPATCH_INFO
*
pRectPatchInfo
)
PURE
;
STDMETHOD
(
DrawTriPatch
)(
THIS_
UINT
Handle
,
CONST
float
*
pNumSegs
,
CONST
WINED3DTRIPATCH_INFO
*
pTriPatchInfo
)
PURE
;
STDMETHOD
(
DeletePatch
)(
THIS_
UINT
Handle
)
PURE
;
STDMETHOD
(
ColorFill
)(
THIS_
struct
IWineD3DSurface
*
pSurface
,
CONST
D3DRECT
*
pRect
,
D3DCOLOR
color
)
PURE
;
STDMETHOD
(
ColorFill
)(
THIS_
struct
IWineD3DSurface
*
pSurface
,
CONST
WINE
D3DRECT
*
pRect
,
D3DCOLOR
color
)
PURE
;
STDMETHOD
(
UpdateTexture
)(
THIS_
struct
IWineD3DBaseTexture
*
pSourceTexture
,
struct
IWineD3DBaseTexture
*
pDestinationTexture
)
PURE
;
STDMETHOD
(
UpdateSurface
)(
THIS_
struct
IWineD3DSurface
*
pSourceSurface
,
CONST
RECT
*
pSourceRect
,
struct
IWineD3DSurface
*
pDestinationSurface
,
CONST
POINT
*
pDestPoint
)
PURE
;
STDMETHOD
(
CopyRects
)(
THIS_
struct
IWineD3DSurface
*
pSourceSurface
,
CONST
RECT
*
pSourceRectsArray
,
UINT
cRects
,
struct
IWineD3DSurface
*
pDestinationSurface
,
CONST
POINT
*
pDestPointsArray
);
...
...
include/wine/wined3d_types.h
View file @
9628a1b2
...
...
@@ -64,6 +64,13 @@ typedef struct _WINED3DMATRIX {
}
DUMMYUNIONNAME
;
}
WINED3DMATRIX
;
typedef
struct
_WINED3DRECT
{
LONG
x1
;
LONG
y1
;
LONG
x2
;
LONG
y2
;
}
WINED3DRECT
;
typedef
struct
_WINED3DLIGHT
{
WINED3DLIGHTTYPE
Type
;
WINED3DCOLORVALUE
Diffuse
;
...
...
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