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
2a63fe66
Commit
2a63fe66
authored
May 28, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
May 29, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d9: Get rid of IDirect3DDevice9Impl.
parent
7a52db09
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
37 additions
and
42 deletions
+37
-42
buffer.c
dlls/d3d9/buffer.c
+2
-2
d3d9_private.h
dlls/d3d9/d3d9_private.h
+20
-25
device.c
dlls/d3d9/device.c
+0
-0
directx.c
dlls/d3d9/directx.c
+2
-2
query.c
dlls/d3d9/query.c
+1
-1
shader.c
dlls/d3d9/shader.c
+2
-2
stateblock.c
dlls/d3d9/stateblock.c
+1
-1
surface.c
dlls/d3d9/surface.c
+1
-1
swapchain.c
dlls/d3d9/swapchain.c
+2
-2
texture.c
dlls/d3d9/texture.c
+3
-3
vertexdeclaration.c
dlls/d3d9/vertexdeclaration.c
+2
-2
volume.c
dlls/d3d9/volume.c
+1
-1
No files found.
dlls/d3d9/buffer.c
View file @
2a63fe66
...
...
@@ -284,7 +284,7 @@ static const struct wined3d_parent_ops d3d9_vertexbuffer_wined3d_parent_ops =
d3d9_vertexbuffer_wined3d_object_destroyed
,
};
HRESULT
vertexbuffer_init
(
IDirect3DVertexBuffer9Impl
*
buffer
,
IDirect3DDevice9Impl
*
device
,
HRESULT
vertexbuffer_init
(
IDirect3DVertexBuffer9Impl
*
buffer
,
struct
d3d9_device
*
device
,
UINT
size
,
UINT
usage
,
DWORD
fvf
,
D3DPOOL
pool
)
{
HRESULT
hr
;
...
...
@@ -578,7 +578,7 @@ static const struct wined3d_parent_ops d3d9_indexbuffer_wined3d_parent_ops =
d3d9_indexbuffer_wined3d_object_destroyed
,
};
HRESULT
indexbuffer_init
(
IDirect3DIndexBuffer9Impl
*
buffer
,
IDirect3DDevice9Impl
*
device
,
HRESULT
indexbuffer_init
(
IDirect3DIndexBuffer9Impl
*
buffer
,
struct
d3d9_device
*
device
,
UINT
size
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
)
{
HRESULT
hr
;
...
...
dlls/d3d9/d3d9_private.h
View file @
2a63fe66
...
...
@@ -144,27 +144,23 @@ struct fvf_declaration
DWORD
fvf
;
};
/*****************************************************************************
* IDirect3DDevice9 implementation structure
*/
typedef
struct
IDirect3DDevice9Impl
struct
d3d9_device
{
IDirect3DDevice9Ex
IDirect3DDevice9Ex_iface
;
struct
wined3d_device_parent
device_parent
;
LONG
ref
;
LONG
ref
count
;
struct
wined3d_device
*
wined3d_device
;
struct
d3d9
*
d3d_parent
;
/* Avoids recursion with nested ReleaseRef to 0 */
BOOL
inDestruction
;
struct
fvf_declaration
*
fvf_decls
;
UINT
fvf_decl_count
,
fvf_decl_size
;
BOOL
notreset
;
BOOL
in_scene
;
}
IDirect3DDevice9Impl
;
BOOL
in_destruction
;
BOOL
not_reset
;
BOOL
in_scene
;
};
HRESULT
device_init
(
IDirect3DDevice9Impl
*
device
,
struct
d3d9
*
parent
,
struct
wined3d
*
wined3d
,
HRESULT
device_init
(
struct
d3d9_device
*
device
,
struct
d3d9
*
parent
,
struct
wined3d
*
wined3d
,
UINT
adapter
,
D3DDEVTYPE
device_type
,
HWND
focus_window
,
DWORD
flags
,
D3DPRESENT_PARAMETERS
*
parameters
,
D3DDISPLAYMODEEX
*
mode
)
DECLSPEC_HIDDEN
;
...
...
@@ -181,7 +177,7 @@ typedef struct IDirect3DVolume9Impl
IUnknown
*
forwardReference
;
}
IDirect3DVolume9Impl
;
HRESULT
volume_init
(
IDirect3DVolume9Impl
*
volume
,
IDirect3DDevice9Impl
*
device
,
UINT
width
,
UINT
height
,
HRESULT
volume_init
(
IDirect3DVolume9Impl
*
volume
,
struct
d3d9_device
*
device
,
UINT
width
,
UINT
height
,
UINT
depth
,
DWORD
usage
,
enum
wined3d_format_id
format
,
enum
wined3d_pool
pool
)
DECLSPEC_HIDDEN
;
/* ------------------- */
...
...
@@ -200,7 +196,7 @@ typedef struct IDirect3DSwapChain9Impl
IDirect3DDevice9Ex
*
parentDevice
;
}
IDirect3DSwapChain9Impl
;
HRESULT
d3d9_swapchain_create
(
IDirect3DDevice9Impl
*
device
,
D3DPRESENT_PARAMETERS
*
present_parameters
,
HRESULT
d3d9_swapchain_create
(
struct
d3d9_device
*
device
,
D3DPRESENT_PARAMETERS
*
present_parameters
,
IDirect3DSwapChain9Impl
**
swapchain
)
DECLSPEC_HIDDEN
;
/* ----------------- */
...
...
@@ -226,7 +222,7 @@ typedef struct IDirect3DSurface9Impl
BOOL
getdc_supported
;
}
IDirect3DSurface9Impl
;
HRESULT
surface_init
(
IDirect3DSurface9Impl
*
surface
,
IDirect3DDevice9Impl
*
device
,
HRESULT
surface_init
(
IDirect3DSurface9Impl
*
surface
,
struct
d3d9_device
*
device
,
UINT
width
,
UINT
height
,
D3DFORMAT
format
,
BOOL
lockable
,
BOOL
discard
,
UINT
level
,
DWORD
usage
,
D3DPOOL
pool
,
D3DMULTISAMPLE_TYPE
multisample_type
,
DWORD
multisample_quality
)
DECLSPEC_HIDDEN
;
IDirect3DSurface9Impl
*
unsafe_impl_from_IDirect3DSurface9
(
IDirect3DSurface9
*
iface
)
DECLSPEC_HIDDEN
;
...
...
@@ -247,7 +243,7 @@ typedef struct IDirect3DVertexBuffer9Impl
DWORD
fvf
;
}
IDirect3DVertexBuffer9Impl
;
HRESULT
vertexbuffer_init
(
IDirect3DVertexBuffer9Impl
*
buffer
,
IDirect3DDevice9Impl
*
device
,
HRESULT
vertexbuffer_init
(
IDirect3DVertexBuffer9Impl
*
buffer
,
struct
d3d9_device
*
device
,
UINT
size
,
UINT
usage
,
DWORD
fvf
,
D3DPOOL
pool
)
DECLSPEC_HIDDEN
;
IDirect3DVertexBuffer9Impl
*
unsafe_impl_from_IDirect3DVertexBuffer9
(
IDirect3DVertexBuffer9
*
iface
)
DECLSPEC_HIDDEN
;
...
...
@@ -267,7 +263,7 @@ typedef struct IDirect3DIndexBuffer9Impl
enum
wined3d_format_id
format
;
}
IDirect3DIndexBuffer9Impl
;
HRESULT
indexbuffer_init
(
IDirect3DIndexBuffer9Impl
*
buffer
,
IDirect3DDevice9Impl
*
device
,
HRESULT
indexbuffer_init
(
IDirect3DIndexBuffer9Impl
*
buffer
,
struct
d3d9_device
*
device
,
UINT
size
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
)
DECLSPEC_HIDDEN
;
IDirect3DIndexBuffer9Impl
*
unsafe_impl_from_IDirect3DIndexBuffer9
(
IDirect3DIndexBuffer9
*
iface
)
DECLSPEC_HIDDEN
;
...
...
@@ -279,11 +275,11 @@ struct d3d9_texture
IDirect3DDevice9Ex
*
parent_device
;
};
HRESULT
cubetexture_init
(
struct
d3d9_texture
*
texture
,
IDirect3DDevice9Impl
*
device
,
HRESULT
cubetexture_init
(
struct
d3d9_texture
*
texture
,
struct
d3d9_device
*
device
,
UINT
edge_length
,
UINT
levels
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
)
DECLSPEC_HIDDEN
;
HRESULT
texture_init
(
struct
d3d9_texture
*
texture
,
IDirect3DDevice9Impl
*
device
,
HRESULT
texture_init
(
struct
d3d9_texture
*
texture
,
struct
d3d9_device
*
device
,
UINT
width
,
UINT
height
,
UINT
levels
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
)
DECLSPEC_HIDDEN
;
HRESULT
volumetexture_init
(
struct
d3d9_texture
*
texture
,
IDirect3DDevice9Impl
*
device
,
HRESULT
volumetexture_init
(
struct
d3d9_texture
*
texture
,
struct
d3d9_device
*
device
,
UINT
width
,
UINT
height
,
UINT
depth
,
UINT
levels
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
)
DECLSPEC_HIDDEN
;
struct
d3d9_texture
*
unsafe_impl_from_IDirect3DBaseTexture9
(
IDirect3DBaseTexture9
*
iface
)
DECLSPEC_HIDDEN
;
...
...
@@ -305,7 +301,7 @@ typedef struct IDirect3DStateBlock9Impl {
IDirect3DDevice9Ex
*
parentDevice
;
}
IDirect3DStateBlock9Impl
;
HRESULT
stateblock_init
(
IDirect3DStateBlock9Impl
*
stateblock
,
IDirect3DDevice9Impl
*
device
,
HRESULT
stateblock_init
(
IDirect3DStateBlock9Impl
*
stateblock
,
struct
d3d9_device
*
device
,
D3DSTATEBLOCKTYPE
type
,
struct
wined3d_stateblock
*
wined3d_stateblock
)
DECLSPEC_HIDDEN
;
/* --------------------------- */
...
...
@@ -331,7 +327,7 @@ typedef struct IDirect3DVertexDeclaration9Impl {
LPDIRECT3DDEVICE9EX
parentDevice
;
}
IDirect3DVertexDeclaration9Impl
;
HRESULT
d3d9_vertex_declaration_create
(
IDirect3DDevice9Impl
*
device
,
HRESULT
d3d9_vertex_declaration_create
(
struct
d3d9_device
*
device
,
const
D3DVERTEXELEMENT9
*
elements
,
IDirect3DVertexDeclaration9Impl
**
declaration
)
DECLSPEC_HIDDEN
;
IDirect3DVertexDeclaration9Impl
*
unsafe_impl_from_IDirect3DVertexDeclaration9
(
IDirect3DVertexDeclaration9
*
iface
)
DECLSPEC_HIDDEN
;
...
...
@@ -351,7 +347,7 @@ typedef struct IDirect3DVertexShader9Impl {
}
IDirect3DVertexShader9Impl
;
HRESULT
vertexshader_init
(
IDirect3DVertexShader9Impl
*
shader
,
IDirect3DDevice9Impl
*
device
,
const
DWORD
*
byte_code
)
DECLSPEC_HIDDEN
;
struct
d3d9_device
*
device
,
const
DWORD
*
byte_code
)
DECLSPEC_HIDDEN
;
IDirect3DVertexShader9Impl
*
unsafe_impl_from_IDirect3DVertexShader9
(
IDirect3DVertexShader9
*
iface
)
DECLSPEC_HIDDEN
;
#define D3D9_MAX_VERTEX_SHADER_CONSTANTF 256
...
...
@@ -372,7 +368,7 @@ typedef struct IDirect3DPixelShader9Impl {
}
IDirect3DPixelShader9Impl
;
HRESULT
pixelshader_init
(
IDirect3DPixelShader9Impl
*
shader
,
IDirect3DDevice9Impl
*
device
,
const
DWORD
*
byte_code
)
DECLSPEC_HIDDEN
;
struct
d3d9_device
*
device
,
const
DWORD
*
byte_code
)
DECLSPEC_HIDDEN
;
IDirect3DPixelShader9Impl
*
unsafe_impl_from_IDirect3DPixelShader9
(
IDirect3DPixelShader9
*
iface
)
DECLSPEC_HIDDEN
;
/* --------------- */
...
...
@@ -393,7 +389,6 @@ typedef struct IDirect3DQuery9Impl {
IDirect3DDevice9Ex
*
parentDevice
;
}
IDirect3DQuery9Impl
;
HRESULT
query_init
(
IDirect3DQuery9Impl
*
query
,
IDirect3DDevice9Impl
*
device
,
D3DQUERYTYPE
type
)
DECLSPEC_HIDDEN
;
HRESULT
query_init
(
IDirect3DQuery9Impl
*
query
,
struct
d3d9_device
*
device
,
D3DQUERYTYPE
type
)
DECLSPEC_HIDDEN
;
#endif
/* __WINE_D3D9_PRIVATE_H */
dlls/d3d9/device.c
View file @
2a63fe66
This source diff could not be displayed because it is too large. You can
view the blob
instead.
dlls/d3d9/directx.c
View file @
2a63fe66
...
...
@@ -435,7 +435,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDevice(IDirect3D9Ex *iface, U
IDirect3DDevice9
**
device
)
{
struct
d3d9
*
d3d9
=
impl_from_IDirect3D9Ex
(
iface
);
IDirect3DDevice9Impl
*
object
;
struct
d3d9_device
*
object
;
HRESULT
hr
;
TRACE
(
"iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x, parameters %p, device %p.
\n
"
,
...
...
@@ -493,7 +493,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDeviceEx(IDirect3D9Ex *iface,
D3DPRESENT_PARAMETERS
*
parameters
,
D3DDISPLAYMODEEX
*
mode
,
IDirect3DDevice9Ex
**
device
)
{
struct
d3d9
*
d3d9
=
impl_from_IDirect3D9Ex
(
iface
);
IDirect3DDevice9Impl
*
object
;
struct
d3d9_device
*
object
;
HRESULT
hr
;
TRACE
(
"iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x, parameters %p, mode %p, device %p.
\n
"
,
...
...
dlls/d3d9/query.c
View file @
2a63fe66
...
...
@@ -163,7 +163,7 @@ static const IDirect3DQuery9Vtbl Direct3DQuery9_Vtbl =
IDirect3DQuery9Impl_GetData
};
HRESULT
query_init
(
IDirect3DQuery9Impl
*
query
,
IDirect3DDevice9Impl
*
device
,
D3DQUERYTYPE
type
)
HRESULT
query_init
(
IDirect3DQuery9Impl
*
query
,
struct
d3d9_device
*
device
,
D3DQUERYTYPE
type
)
{
HRESULT
hr
;
...
...
dlls/d3d9/shader.c
View file @
2a63fe66
...
...
@@ -135,7 +135,7 @@ static const struct wined3d_parent_ops d3d9_vertexshader_wined3d_parent_ops =
d3d9_vertexshader_wined3d_object_destroyed
,
};
HRESULT
vertexshader_init
(
IDirect3DVertexShader9Impl
*
shader
,
IDirect3DDevice9Impl
*
device
,
const
DWORD
*
byte_code
)
HRESULT
vertexshader_init
(
IDirect3DVertexShader9Impl
*
shader
,
struct
d3d9_device
*
device
,
const
DWORD
*
byte_code
)
{
HRESULT
hr
;
...
...
@@ -281,7 +281,7 @@ static const struct wined3d_parent_ops d3d9_pixelshader_wined3d_parent_ops =
d3d9_pixelshader_wined3d_object_destroyed
,
};
HRESULT
pixelshader_init
(
IDirect3DPixelShader9Impl
*
shader
,
IDirect3DDevice9Impl
*
device
,
const
DWORD
*
byte_code
)
HRESULT
pixelshader_init
(
IDirect3DPixelShader9Impl
*
shader
,
struct
d3d9_device
*
device
,
const
DWORD
*
byte_code
)
{
HRESULT
hr
;
...
...
dlls/d3d9/stateblock.c
View file @
2a63fe66
...
...
@@ -134,7 +134,7 @@ static const IDirect3DStateBlock9Vtbl Direct3DStateBlock9_Vtbl =
IDirect3DStateBlock9Impl_Apply
};
HRESULT
stateblock_init
(
IDirect3DStateBlock9Impl
*
stateblock
,
IDirect3DDevice9Impl
*
device
,
HRESULT
stateblock_init
(
IDirect3DStateBlock9Impl
*
stateblock
,
struct
d3d9_device
*
device
,
D3DSTATEBLOCKTYPE
type
,
struct
wined3d_stateblock
*
wined3d_stateblock
)
{
HRESULT
hr
;
...
...
dlls/d3d9/surface.c
View file @
2a63fe66
...
...
@@ -395,7 +395,7 @@ static const struct wined3d_parent_ops d3d9_surface_wined3d_parent_ops =
surface_wined3d_object_destroyed
,
};
HRESULT
surface_init
(
IDirect3DSurface9Impl
*
surface
,
IDirect3DDevice9Impl
*
device
,
HRESULT
surface_init
(
IDirect3DSurface9Impl
*
surface
,
struct
d3d9_device
*
device
,
UINT
width
,
UINT
height
,
D3DFORMAT
format
,
BOOL
lockable
,
BOOL
discard
,
UINT
level
,
DWORD
usage
,
D3DPOOL
pool
,
D3DMULTISAMPLE_TYPE
multisample_type
,
DWORD
multisample_quality
)
{
...
...
dlls/d3d9/swapchain.c
View file @
2a63fe66
...
...
@@ -254,7 +254,7 @@ static const struct wined3d_parent_ops d3d9_swapchain_wined3d_parent_ops =
d3d9_swapchain_wined3d_object_released
,
};
static
HRESULT
swapchain_init
(
IDirect3DSwapChain9Impl
*
swapchain
,
IDirect3DDevice9Impl
*
device
,
static
HRESULT
swapchain_init
(
IDirect3DSwapChain9Impl
*
swapchain
,
struct
d3d9_device
*
device
,
D3DPRESENT_PARAMETERS
*
present_parameters
)
{
struct
wined3d_swapchain_desc
desc
;
...
...
@@ -312,7 +312,7 @@ static HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevic
return
D3D_OK
;
}
HRESULT
d3d9_swapchain_create
(
IDirect3DDevice9Impl
*
device
,
D3DPRESENT_PARAMETERS
*
present_parameters
,
HRESULT
d3d9_swapchain_create
(
struct
d3d9_device
*
device
,
D3DPRESENT_PARAMETERS
*
present_parameters
,
IDirect3DSwapChain9Impl
**
swapchain
)
{
IDirect3DSwapChain9Impl
*
object
;
...
...
dlls/d3d9/texture.c
View file @
2a63fe66
...
...
@@ -1306,7 +1306,7 @@ static const struct wined3d_parent_ops d3d9_texture_wined3d_parent_ops =
d3d9_texture_wined3d_object_destroyed
,
};
HRESULT
texture_init
(
struct
d3d9_texture
*
texture
,
IDirect3DDevice9Impl
*
device
,
HRESULT
texture_init
(
struct
d3d9_texture
*
texture
,
struct
d3d9_device
*
device
,
UINT
width
,
UINT
height
,
UINT
levels
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
)
{
HRESULT
hr
;
...
...
@@ -1331,7 +1331,7 @@ HRESULT texture_init(struct d3d9_texture *texture, IDirect3DDevice9Impl *device,
return
D3D_OK
;
}
HRESULT
cubetexture_init
(
struct
d3d9_texture
*
texture
,
IDirect3DDevice9Impl
*
device
,
HRESULT
cubetexture_init
(
struct
d3d9_texture
*
texture
,
struct
d3d9_device
*
device
,
UINT
edge_length
,
UINT
levels
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
)
{
HRESULT
hr
;
...
...
@@ -1356,7 +1356,7 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, IDirect3DDevice9Impl *dev
return
D3D_OK
;
}
HRESULT
volumetexture_init
(
struct
d3d9_texture
*
texture
,
IDirect3DDevice9Impl
*
device
,
HRESULT
volumetexture_init
(
struct
d3d9_texture
*
texture
,
struct
d3d9_device
*
device
,
UINT
width
,
UINT
height
,
UINT
depth
,
UINT
levels
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
)
{
HRESULT
hr
;
...
...
dlls/d3d9/vertexdeclaration.c
View file @
2a63fe66
...
...
@@ -367,7 +367,7 @@ static HRESULT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9 *d3d9_elem
}
static
HRESULT
vertexdeclaration_init
(
IDirect3DVertexDeclaration9Impl
*
declaration
,
IDirect3DDevice9Impl
*
device
,
const
D3DVERTEXELEMENT9
*
elements
)
struct
d3d9_device
*
device
,
const
D3DVERTEXELEMENT9
*
elements
)
{
struct
wined3d_vertex_element
*
wined3d_elements
;
UINT
wined3d_element_count
;
...
...
@@ -413,7 +413,7 @@ static HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declarati
return
D3D_OK
;
}
HRESULT
d3d9_vertex_declaration_create
(
IDirect3DDevice9Impl
*
device
,
HRESULT
d3d9_vertex_declaration_create
(
struct
d3d9_device
*
device
,
const
D3DVERTEXELEMENT9
*
elements
,
IDirect3DVertexDeclaration9Impl
**
declaration
)
{
IDirect3DVertexDeclaration9Impl
*
object
;
...
...
dlls/d3d9/volume.c
View file @
2a63fe66
...
...
@@ -277,7 +277,7 @@ static const struct wined3d_parent_ops d3d9_volume_wined3d_parent_ops =
volume_wined3d_object_destroyed
,
};
HRESULT
volume_init
(
IDirect3DVolume9Impl
*
volume
,
IDirect3DDevice9Impl
*
device
,
UINT
width
,
UINT
height
,
HRESULT
volume_init
(
IDirect3DVolume9Impl
*
volume
,
struct
d3d9_device
*
device
,
UINT
width
,
UINT
height
,
UINT
depth
,
DWORD
usage
,
enum
wined3d_format_id
format
,
enum
wined3d_pool
pool
)
{
HRESULT
hr
;
...
...
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