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
7da2dc74
Commit
7da2dc74
authored
Apr 23, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 24, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d9: Get rid of IDirect3DVolumeTexture9Impl.
parent
7efbfe49
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
19 deletions
+3
-19
d3d9_private.h
dlls/d3d9/d3d9_private.h
+1
-17
device.c
dlls/d3d9/device.c
+2
-2
volumetexture.c
dlls/d3d9/volumetexture.c
+0
-0
No files found.
dlls/d3d9/d3d9_private.h
View file @
7da2dc74
...
@@ -315,23 +315,7 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, IDirect3DDevice9Impl *dev
...
@@ -315,23 +315,7 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, IDirect3DDevice9Impl *dev
UINT
edge_length
,
UINT
levels
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
)
DECLSPEC_HIDDEN
;
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
,
IDirect3DDevice9Impl
*
device
,
UINT
width
,
UINT
height
,
UINT
levels
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
)
DECLSPEC_HIDDEN
;
UINT
width
,
UINT
height
,
UINT
levels
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
)
DECLSPEC_HIDDEN
;
HRESULT
volumetexture_init
(
struct
d3d9_texture
*
texture
,
IDirect3DDevice9Impl
*
device
,
/* ----------------------- */
/* IDirect3DVolumeTexture9 */
/* ----------------------- */
/*****************************************************************************
* IDirect3DVolumeTexture9 implementation structure
*/
typedef
struct
IDirect3DVolumeTexture9Impl
{
IDirect3DVolumeTexture9
IDirect3DVolumeTexture9_iface
;
LONG
ref
;
struct
wined3d_texture
*
wined3d_texture
;
IDirect3DDevice9Ex
*
parentDevice
;
}
IDirect3DVolumeTexture9Impl
;
HRESULT
volumetexture_init
(
IDirect3DVolumeTexture9Impl
*
texture
,
IDirect3DDevice9Impl
*
device
,
UINT
width
,
UINT
height
,
UINT
depth
,
UINT
levels
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
)
DECLSPEC_HIDDEN
;
UINT
width
,
UINT
height
,
UINT
depth
,
UINT
levels
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
)
DECLSPEC_HIDDEN
;
/* ----------------------- */
/* ----------------------- */
...
...
dlls/d3d9/device.c
View file @
7da2dc74
...
@@ -731,7 +731,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateVolumeTexture(IDirect3DDevice9E
...
@@ -731,7 +731,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateVolumeTexture(IDirect3DDevice9E
D3DPOOL
pool
,
IDirect3DVolumeTexture9
**
texture
,
HANDLE
*
shared_handle
)
D3DPOOL
pool
,
IDirect3DVolumeTexture9
**
texture
,
HANDLE
*
shared_handle
)
{
{
IDirect3DDevice9Impl
*
This
=
impl_from_IDirect3DDevice9Ex
(
iface
);
IDirect3DDevice9Impl
*
This
=
impl_from_IDirect3DDevice9Ex
(
iface
);
IDirect3DVolumeTexture9Impl
*
object
;
struct
d3d9_texture
*
object
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"iface %p, width %u, height %u, depth %u, levels %u
\n
"
,
TRACE
(
"iface %p, width %u, height %u, depth %u, levels %u
\n
"
,
...
@@ -758,7 +758,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateVolumeTexture(IDirect3DDevice9E
...
@@ -758,7 +758,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateVolumeTexture(IDirect3DDevice9E
}
}
TRACE
(
"Created volume texture %p.
\n
"
,
object
);
TRACE
(
"Created volume texture %p.
\n
"
,
object
);
*
texture
=
&
object
->
IDirect3DVolum
eTexture9_iface
;
*
texture
=
(
IDirect3DVolumeTexture9
*
)
&
object
->
IDirect3DBas
eTexture9_iface
;
return
D3D_OK
;
return
D3D_OK
;
}
}
...
...
dlls/d3d9/volumetexture.c
View file @
7da2dc74
This diff is collapsed.
Click to expand it.
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