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
75d166f6
Commit
75d166f6
authored
May 23, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
May 23, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d8: Get rid of IDirect3DVolume8Impl.
parent
ec466ff3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
88 additions
and
93 deletions
+88
-93
d3d8_private.h
dlls/d3d8/d3d8_private.h
+4
-13
device.c
dlls/d3d8/device.c
+1
-1
texture.c
dlls/d3d8/texture.c
+3
-3
volume.c
dlls/d3d8/volume.c
+80
-76
No files found.
dlls/d3d8/d3d8_private.h
View file @
75d166f6
...
...
@@ -100,8 +100,6 @@
void
fixup_caps
(
WINED3DCAPS
*
pWineCaps
)
DECLSPEC_HIDDEN
;
typedef
struct
IDirect3DVolume8Impl
IDirect3DVolume8Impl
;
struct
d3d8
{
IDirect3D8
IDirect3D8_iface
;
...
...
@@ -168,23 +166,16 @@ struct d3d8_device
HRESULT
device_init
(
struct
d3d8_device
*
device
,
struct
d3d8
*
parent
,
struct
wined3d
*
wined3d
,
UINT
adapter
,
D3DDEVTYPE
device_type
,
HWND
focus_window
,
DWORD
flags
,
D3DPRESENT_PARAMETERS
*
parameters
)
DECLSPEC_HIDDEN
;
/* ---------------- */
/* IDirect3DVolume8 */
/* ---------------- */
/*****************************************************************************
* IDirect3DVolume8 implementation structure
*/
struct
IDirect3DVolume8Impl
struct
d3d8_volume
{
IDirect3DVolume8
IDirect3DVolume8_iface
;
LONG
ref
;
IDirect3DVolume8
IDirect3DVolume8_iface
;
LONG
refcount
;
struct
wined3d_volume
*
wined3d_volume
;
IUnknown
*
container
;
IUnknown
*
forwardReference
;
};
HRESULT
volume_init
(
IDirect3DVolume8Impl
*
volume
,
struct
d3d8_device
*
device
,
UINT
width
,
UINT
height
,
HRESULT
volume_init
(
struct
d3d8_volume
*
volume
,
struct
d3d8_device
*
device
,
UINT
width
,
UINT
height
,
UINT
depth
,
DWORD
usage
,
enum
wined3d_format_id
format
,
enum
wined3d_pool
pool
)
DECLSPEC_HIDDEN
;
struct
d3d8_swapchain
...
...
dlls/d3d8/device.c
View file @
75d166f6
...
...
@@ -2902,7 +2902,7 @@ static HRESULT CDECL device_parent_create_volume(struct wined3d_device_parent *d
enum
wined3d_pool
pool
,
DWORD
usage
,
struct
wined3d_volume
**
volume
)
{
struct
d3d8_device
*
device
=
device_from_device_parent
(
device_parent
);
IDirect3DVolume8Impl
*
object
;
struct
d3d8_volume
*
object
;
HRESULT
hr
;
TRACE
(
"device_parent %p, container_parent %p, width %u, height %u, depth %u, "
...
...
dlls/d3d8/texture.c
View file @
75d166f6
...
...
@@ -1031,7 +1031,7 @@ static HRESULT WINAPI d3d8_texture_3d_GetVolumeLevel(IDirect3DVolumeTexture8 *if
{
struct
d3d8_texture
*
texture
=
impl_from_IDirect3DVolumeTexture8
(
iface
);
struct
wined3d_resource
*
sub_resource
;
IDirect3DVolume8Impl
*
volume_impl
;
struct
d3d8_volume
*
volume_impl
;
TRACE
(
"iface %p, level %u, volume %p.
\n
"
,
iface
,
level
,
volume
);
...
...
@@ -1055,7 +1055,7 @@ static HRESULT WINAPI d3d8_texture_3d_LockBox(IDirect3DVolumeTexture8 *iface,
{
struct
d3d8_texture
*
texture
=
impl_from_IDirect3DVolumeTexture8
(
iface
);
struct
wined3d_resource
*
sub_resource
;
IDirect3DVolume8Impl
*
volume_impl
;
struct
d3d8_volume
*
volume_impl
;
HRESULT
hr
;
TRACE
(
"iface %p, level %u, locked_box %p, box %p, flags %#x.
\n
"
,
...
...
@@ -1078,7 +1078,7 @@ static HRESULT WINAPI d3d8_texture_3d_UnlockBox(IDirect3DVolumeTexture8 *iface,
{
struct
d3d8_texture
*
texture
=
impl_from_IDirect3DVolumeTexture8
(
iface
);
struct
wined3d_resource
*
sub_resource
;
IDirect3DVolume8Impl
*
volume_impl
;
struct
d3d8_volume
*
volume_impl
;
HRESULT
hr
;
TRACE
(
"iface %p, level %u.
\n
"
,
iface
,
level
);
...
...
dlls/d3d8/volume.c
View file @
75d166f6
...
...
@@ -23,50 +23,52 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d8
);
static
inline
IDirect3DVolume8Impl
*
impl_from_IDirect3DVolume8
(
IDirect3DVolume8
*
iface
)
static
inline
struct
d3d8_volume
*
impl_from_IDirect3DVolume8
(
IDirect3DVolume8
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
IDirect3DVolume8Impl
,
IDirect3DVolume8_iface
);
return
CONTAINING_RECORD
(
iface
,
struct
d3d8_volume
,
IDirect3DVolume8_iface
);
}
static
HRESULT
WINAPI
IDirect3DVolume8Impl_QueryInterface
(
IDirect3DVolume8
*
iface
,
REFIID
riid
,
void
**
ppobj
)
static
HRESULT
WINAPI
d3d8_volume_QueryInterface
(
IDirect3DVolume8
*
iface
,
REFIID
riid
,
void
**
out
)
{
TRACE
(
"iface %p, riid %s, object %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppobj
);
TRACE
(
"iface %p, riid %s, object %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
out
);
if
(
IsEqualGUID
(
riid
,
&
IID_IDirect3DVolume8
)
||
IsEqualGUID
(
riid
,
&
IID_IUnknown
))
{
IUnknown_AddRef
(
iface
);
*
ppobj
=
iface
;
*
out
=
iface
;
return
S_OK
;
}
WARN
(
"%s not implemented, returning E_NOINTERFACE.
\n
"
,
debugstr_guid
(
riid
));
*
ppobj
=
NULL
;
*
out
=
NULL
;
return
E_NOINTERFACE
;
}
static
ULONG
WINAPI
IDirect3DVolume8Impl
_AddRef
(
IDirect3DVolume8
*
iface
)
static
ULONG
WINAPI
d3d8_volume
_AddRef
(
IDirect3DVolume8
*
iface
)
{
IDirect3DVolume8Impl
*
This
=
impl_from_IDirect3DVolume8
(
iface
);
struct
d3d8_volume
*
volume
=
impl_from_IDirect3DVolume8
(
iface
);
TRACE
(
"iface %p.
\n
"
,
iface
);
if
(
This
->
forwardReference
)
{
if
(
volume
->
forwardReference
)
{
/* Forward to the containerParent */
TRACE
(
"(%p) : Forwarding to %p
\n
"
,
This
,
This
->
forwardReference
);
return
IUnknown_AddRef
(
This
->
forwardReference
);
}
else
{
TRACE
(
"Forwarding to %p,
\n
"
,
volume
->
forwardReference
);
return
IUnknown_AddRef
(
volume
->
forwardReference
);
}
else
{
/* No container, handle our own refcounting */
ULONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
ULONG
ref
=
InterlockedIncrement
(
&
volume
->
refcount
);
TRACE
(
"%p increasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
1
)
{
wined3d_mutex_lock
();
wined3d_volume_incref
(
This
->
wined3d_volume
);
wined3d_volume_incref
(
volume
->
wined3d_volume
);
wined3d_mutex_unlock
();
}
...
...
@@ -74,26 +76,29 @@ static ULONG WINAPI IDirect3DVolume8Impl_AddRef(IDirect3DVolume8 *iface)
}
}
static
ULONG
WINAPI
IDirect3DVolume8Impl
_Release
(
IDirect3DVolume8
*
iface
)
static
ULONG
WINAPI
d3d8_volume
_Release
(
IDirect3DVolume8
*
iface
)
{
IDirect3DVolume8Impl
*
This
=
impl_from_IDirect3DVolume8
(
iface
);
struct
d3d8_volume
*
volume
=
impl_from_IDirect3DVolume8
(
iface
);
TRACE
(
"iface %p.
\n
"
,
iface
);
if
(
This
->
forwardReference
)
{
if
(
volume
->
forwardReference
)
{
/* Forward to the containerParent */
TRACE
(
"
(%p) : Forwarding to %p
\n
"
,
This
,
This
->
forwardReference
);
return
IUnknown_Release
(
This
->
forwardReference
);
TRACE
(
"
Forwarding to %p.
\n
"
,
volume
->
forwardReference
);
return
IUnknown_Release
(
volume
->
forwardReference
);
}
else
{
else
{
/* No container, handle our own refcounting */
ULONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
ULONG
ref
=
InterlockedDecrement
(
&
volume
->
refcount
);
TRACE
(
"%p decreasing refcount to %u.
\n
"
,
iface
,
ref
);
if
(
ref
==
0
)
{
if
(
!
ref
)
{
wined3d_mutex_lock
();
wined3d_volume_decref
(
This
->
wined3d_volume
);
wined3d_volume_decref
(
volume
->
wined3d_volume
);
wined3d_mutex_unlock
();
}
...
...
@@ -101,16 +106,15 @@ static ULONG WINAPI IDirect3DVolume8Impl_Release(IDirect3DVolume8 *iface)
}
}
static
HRESULT
WINAPI
IDirect3DVolume8Impl_GetDevice
(
IDirect3DVolume8
*
iface
,
IDirect3DDevice8
**
device
)
static
HRESULT
WINAPI
d3d8_volume_GetDevice
(
IDirect3DVolume8
*
iface
,
IDirect3DDevice8
**
device
)
{
IDirect3DVolume8Impl
*
This
=
impl_from_IDirect3DVolume8
(
iface
);
struct
d3d8_volume
*
volume
=
impl_from_IDirect3DVolume8
(
iface
);
IDirect3DResource8
*
resource
;
HRESULT
hr
;
TRACE
(
"iface %p, device %p.
\n
"
,
iface
,
device
);
hr
=
IUnknown_QueryInterface
(
This
->
forwardReference
,
&
IID_IDirect3DResource8
,
(
void
**
)
&
resource
);
hr
=
IUnknown_QueryInterface
(
volume
->
forwardReference
,
&
IID_IDirect3DResource8
,
(
void
**
)
&
resource
);
if
(
SUCCEEDED
(
hr
))
{
hr
=
IDirect3DResource8_GetDevice
(
resource
,
device
);
...
...
@@ -122,86 +126,86 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(IDirect3DVolume8 *iface,
return
hr
;
}
static
HRESULT
WINAPI
IDirect3DVolume8Impl_SetPrivateData
(
IDirect3DVolume8
*
iface
,
REFGUID
ref
guid
,
const
void
*
pData
,
DWORD
SizeOfData
,
DWORD
F
lags
)
static
HRESULT
WINAPI
d3d8_volume_SetPrivateData
(
IDirect3DVolume8
*
iface
,
REFGUID
guid
,
const
void
*
data
,
DWORD
data_size
,
DWORD
f
lags
)
{
IDirect3DVolume8Impl
*
This
=
impl_from_IDirect3DVolume8
(
iface
);
struct
d3d8_volume
*
volume
=
impl_from_IDirect3DVolume8
(
iface
);
struct
wined3d_resource
*
resource
;
HRESULT
hr
;
TRACE
(
"iface %p, guid %s, data %p, data_size %u, flags %#x.
\n
"
,
iface
,
debugstr_guid
(
refguid
),
pData
,
SizeOfData
,
F
lags
);
iface
,
debugstr_guid
(
guid
),
data
,
data_size
,
f
lags
);
wined3d_mutex_lock
();
resource
=
wined3d_volume_get_resource
(
This
->
wined3d_volume
);
hr
=
wined3d_resource_set_private_data
(
resource
,
refguid
,
pData
,
SizeOfData
,
F
lags
);
resource
=
wined3d_volume_get_resource
(
volume
->
wined3d_volume
);
hr
=
wined3d_resource_set_private_data
(
resource
,
guid
,
data
,
data_size
,
f
lags
);
wined3d_mutex_unlock
();
return
hr
;
}
static
HRESULT
WINAPI
IDirect3DVolume8Impl_GetPrivateData
(
IDirect3DVolume8
*
iface
,
REFGUID
ref
guid
,
void
*
pData
,
DWORD
*
pSizeOfData
)
static
HRESULT
WINAPI
d3d8_volume_GetPrivateData
(
IDirect3DVolume8
*
iface
,
REFGUID
guid
,
void
*
data
,
DWORD
*
data_size
)
{
IDirect3DVolume8Impl
*
This
=
impl_from_IDirect3DVolume8
(
iface
);
struct
d3d8_volume
*
volume
=
impl_from_IDirect3DVolume8
(
iface
);
struct
wined3d_resource
*
resource
;
HRESULT
hr
;
TRACE
(
"iface %p, guid %s, data %p, data_size %p.
\n
"
,
iface
,
debugstr_guid
(
refguid
),
pData
,
pSizeOfData
);
iface
,
debugstr_guid
(
guid
),
data
,
data_size
);
wined3d_mutex_lock
();
resource
=
wined3d_volume_get_resource
(
This
->
wined3d_volume
);
hr
=
wined3d_resource_get_private_data
(
resource
,
refguid
,
pData
,
pSizeOfData
);
resource
=
wined3d_volume_get_resource
(
volume
->
wined3d_volume
);
hr
=
wined3d_resource_get_private_data
(
resource
,
guid
,
data
,
data_size
);
wined3d_mutex_unlock
();
return
hr
;
}
static
HRESULT
WINAPI
IDirect3DVolume8Impl_FreePrivateData
(
IDirect3DVolume8
*
iface
,
REFGUID
ref
guid
)
static
HRESULT
WINAPI
d3d8_volume_FreePrivateData
(
IDirect3DVolume8
*
iface
,
REFGUID
guid
)
{
IDirect3DVolume8Impl
*
This
=
impl_from_IDirect3DVolume8
(
iface
);
struct
d3d8_volume
*
volume
=
impl_from_IDirect3DVolume8
(
iface
);
struct
wined3d_resource
*
resource
;
HRESULT
hr
;
TRACE
(
"iface %p, guid %s.
\n
"
,
iface
,
debugstr_guid
(
ref
guid
));
TRACE
(
"iface %p, guid %s.
\n
"
,
iface
,
debugstr_guid
(
guid
));
wined3d_mutex_lock
();
resource
=
wined3d_volume_get_resource
(
This
->
wined3d_volume
);
hr
=
wined3d_resource_free_private_data
(
resource
,
ref
guid
);
resource
=
wined3d_volume_get_resource
(
volume
->
wined3d_volume
);
hr
=
wined3d_resource_free_private_data
(
resource
,
guid
);
wined3d_mutex_unlock
();
return
hr
;
}
static
HRESULT
WINAPI
IDirect3DVolume8Impl_GetContainer
(
IDirect3DVolume8
*
iface
,
REFIID
riid
,
void
**
ppContainer
)
static
HRESULT
WINAPI
d3d8_volume_GetContainer
(
IDirect3DVolume8
*
iface
,
REFIID
riid
,
void
**
container
)
{
IDirect3DVolume8Impl
*
This
=
impl_from_IDirect3DVolume8
(
iface
);
struct
d3d8_volume
*
volume
=
impl_from_IDirect3DVolume8
(
iface
);
HRESULT
res
;
TRACE
(
"iface %p, riid %s, container %p.
\n
"
,
iface
,
debugstr_guid
(
riid
),
ppC
ontainer
);
iface
,
debugstr_guid
(
riid
),
c
ontainer
);
if
(
!
This
->
container
)
return
E_NOINTERFACE
;
if
(
!
volume
->
container
)
return
E_NOINTERFACE
;
res
=
IUnknown_QueryInterface
(
This
->
container
,
riid
,
ppC
ontainer
);
res
=
IUnknown_QueryInterface
(
volume
->
container
,
riid
,
c
ontainer
);
TRACE
(
"Returning
ppContainer %p, *ppContainer %p
\n
"
,
ppContainer
,
*
ppC
ontainer
);
TRACE
(
"Returning
%p.
\n
"
,
*
c
ontainer
);
return
res
;
}
static
HRESULT
WINAPI
IDirect3DVolume8Impl
_GetDesc
(
IDirect3DVolume8
*
iface
,
D3DVOLUME_DESC
*
desc
)
static
HRESULT
WINAPI
d3d8_volume
_GetDesc
(
IDirect3DVolume8
*
iface
,
D3DVOLUME_DESC
*
desc
)
{
IDirect3DVolume8Impl
*
This
=
impl_from_IDirect3DVolume8
(
iface
);
struct
d3d8_volume
*
volume
=
impl_from_IDirect3DVolume8
(
iface
);
struct
wined3d_resource_desc
wined3d_desc
;
struct
wined3d_resource
*
wined3d_resource
;
TRACE
(
"iface %p, desc %p.
\n
"
,
iface
,
desc
);
wined3d_mutex_lock
();
wined3d_resource
=
wined3d_volume_get_resource
(
This
->
wined3d_volume
);
wined3d_resource
=
wined3d_volume_get_resource
(
volume
->
wined3d_volume
);
wined3d_resource_get_desc
(
wined3d_resource
,
&
wined3d_desc
);
wined3d_mutex_unlock
();
...
...
@@ -217,10 +221,10 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(IDirect3DVolume8 *iface, D3DV
return
D3D_OK
;
}
static
HRESULT
WINAPI
IDirect3DVolume8Impl
_LockBox
(
IDirect3DVolume8
*
iface
,
static
HRESULT
WINAPI
d3d8_volume
_LockBox
(
IDirect3DVolume8
*
iface
,
D3DLOCKED_BOX
*
locked_box
,
const
D3DBOX
*
box
,
DWORD
flags
)
{
IDirect3DVolume8Impl
*
This
=
impl_from_IDirect3DVolume8
(
iface
);
struct
d3d8_volume
*
volume
=
impl_from_IDirect3DVolume8
(
iface
);
struct
wined3d_map_desc
map_desc
;
HRESULT
hr
;
...
...
@@ -228,7 +232,7 @@ static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(IDirect3DVolume8 *iface,
iface
,
locked_box
,
box
,
flags
);
wined3d_mutex_lock
();
hr
=
wined3d_volume_map
(
This
->
wined3d_volume
,
&
map_desc
,
(
const
struct
wined3d_box
*
)
box
,
flags
);
hr
=
wined3d_volume_map
(
volume
->
wined3d_volume
,
&
map_desc
,
(
const
struct
wined3d_box
*
)
box
,
flags
);
wined3d_mutex_unlock
();
locked_box
->
RowPitch
=
map_desc
.
row_pitch
;
...
...
@@ -238,35 +242,35 @@ static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(IDirect3DVolume8 *iface,
return
hr
;
}
static
HRESULT
WINAPI
IDirect3DVolume8Impl
_UnlockBox
(
IDirect3DVolume8
*
iface
)
static
HRESULT
WINAPI
d3d8_volume
_UnlockBox
(
IDirect3DVolume8
*
iface
)
{
IDirect3DVolume8Impl
*
This
=
impl_from_IDirect3DVolume8
(
iface
);
struct
d3d8_volume
*
volume
=
impl_from_IDirect3DVolume8
(
iface
);
HRESULT
hr
;
TRACE
(
"iface %p.
\n
"
,
iface
);
wined3d_mutex_lock
();
hr
=
wined3d_volume_unmap
(
This
->
wined3d_volume
);
hr
=
wined3d_volume_unmap
(
volume
->
wined3d_volume
);
wined3d_mutex_unlock
();
return
hr
;
}
static
const
IDirect3DVolume8Vtbl
Direct3DVolume8_V
tbl
=
static
const
IDirect3DVolume8Vtbl
d3d8_volume_v
tbl
=
{
/* IUnknown */
IDirect3DVolume8Impl
_QueryInterface
,
IDirect3DVolume8Impl
_AddRef
,
IDirect3DVolume8Impl
_Release
,
d3d8_volume
_QueryInterface
,
d3d8_volume
_AddRef
,
d3d8_volume
_Release
,
/* IDirect3DVolume8 */
IDirect3DVolume8Impl
_GetDevice
,
IDirect3DVolume8Impl
_SetPrivateData
,
IDirect3DVolume8Impl
_GetPrivateData
,
IDirect3DVolume8Impl
_FreePrivateData
,
IDirect3DVolume8Impl
_GetContainer
,
IDirect3DVolume8Impl
_GetDesc
,
IDirect3DVolume8Impl
_LockBox
,
IDirect3DVolume8Impl_UnlockBox
d3d8_volume
_GetDevice
,
d3d8_volume
_SetPrivateData
,
d3d8_volume
_GetPrivateData
,
d3d8_volume
_FreePrivateData
,
d3d8_volume
_GetContainer
,
d3d8_volume
_GetDesc
,
d3d8_volume
_LockBox
,
d3d8_volume_UnlockBox
,
};
static
void
STDMETHODCALLTYPE
volume_wined3d_object_destroyed
(
void
*
parent
)
...
...
@@ -279,13 +283,13 @@ static const struct wined3d_parent_ops d3d8_volume_wined3d_parent_ops =
volume_wined3d_object_destroyed
,
};
HRESULT
volume_init
(
IDirect3DVolume8Impl
*
volume
,
struct
d3d8_device
*
device
,
UINT
width
,
UINT
height
,
HRESULT
volume_init
(
struct
d3d8_volume
*
volume
,
struct
d3d8_device
*
device
,
UINT
width
,
UINT
height
,
UINT
depth
,
DWORD
usage
,
enum
wined3d_format_id
format
,
enum
wined3d_pool
pool
)
{
HRESULT
hr
;
volume
->
IDirect3DVolume8_iface
.
lpVtbl
=
&
Direct3DVolume8_V
tbl
;
volume
->
ref
=
1
;
volume
->
IDirect3DVolume8_iface
.
lpVtbl
=
&
d3d8_volume_v
tbl
;
volume
->
ref
count
=
1
;
hr
=
wined3d_volume_create
(
device
->
wined3d_device
,
width
,
height
,
depth
,
usage
,
format
,
pool
,
volume
,
&
d3d8_volume_wined3d_parent_ops
,
&
volume
->
wined3d_volume
);
...
...
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