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
15c1a26b
Commit
15c1a26b
authored
Dec 06, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 06, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Create volumes inside wined3d.
parent
da354931
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
127 additions
and
188 deletions
+127
-188
device.c
dlls/d3d10core/device.c
+14
-25
d3d8_private.h
dlls/d3d8/d3d8_private.h
+2
-3
device.c
dlls/d3d8/device.c
+25
-43
volume.c
dlls/d3d8/volume.c
+5
-13
d3d9_private.h
dlls/d3d9/d3d9_private.h
+2
-3
device.c
dlls/d3d9/device.c
+25
-43
volume.c
dlls/d3d9/volume.c
+5
-14
ddraw.c
dlls/ddraw/ddraw.c
+14
-16
texture.c
dlls/wined3d/texture.c
+2
-4
volume.c
dlls/wined3d/volume.c
+26
-16
wined3d.spec
dlls/wined3d/wined3d.spec
+0
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+5
-1
wined3d.h
include/wine/wined3d.h
+2
-6
No files found.
dlls/d3d10core/device.c
View file @
15c1a26b
...
@@ -1843,6 +1843,19 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent
...
@@ -1843,6 +1843,19 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent
return
S_OK
;
return
S_OK
;
}
}
static
HRESULT
CDECL
device_parent_volume_created
(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
struct
wined3d_volume
*
volume
,
void
**
parent
,
const
struct
wined3d_parent_ops
**
parent_ops
)
{
TRACE
(
"device_parent %p, container_parent %p, volume %p, parent %p, parent_ops %p.
\n
"
,
device_parent
,
container_parent
,
volume
,
parent
,
parent_ops
);
*
parent
=
container_parent
;
*
parent_ops
=
&
d3d10_null_wined3d_parent_ops
;
return
S_OK
;
}
static
HRESULT
CDECL
device_parent_create_swapchain_surface
(
struct
wined3d_device_parent
*
device_parent
,
static
HRESULT
CDECL
device_parent_create_swapchain_surface
(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
const
struct
wined3d_resource_desc
*
wined3d_desc
,
struct
wined3d_surface
**
surface
)
void
*
container_parent
,
const
struct
wined3d_resource_desc
*
wined3d_desc
,
struct
wined3d_surface
**
surface
)
{
{
...
@@ -1885,30 +1898,6 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic
...
@@ -1885,30 +1898,6 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic
return
S_OK
;
return
S_OK
;
}
}
static
HRESULT
CDECL
device_parent_create_volume
(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
UINT
width
,
UINT
height
,
UINT
depth
,
UINT
level
,
enum
wined3d_format_id
format
,
enum
wined3d_pool
pool
,
DWORD
usage
,
struct
wined3d_volume
**
volume
)
{
HRESULT
hr
;
TRACE
(
"device_parent %p, container_parent %p, width %u, height %u, depth %u, "
"format %#x, pool %#x, usage %#x, volume %p.
\n
"
,
device_parent
,
container_parent
,
width
,
height
,
depth
,
format
,
pool
,
usage
,
volume
);
hr
=
wined3d_volume_create
(
device_from_wined3d_device_parent
(
device_parent
)
->
wined3d_device
,
width
,
height
,
depth
,
level
,
usage
,
format
,
pool
,
NULL
,
&
d3d10_subresource_parent_ops
,
volume
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to create wined3d volume, hr %#x.
\n
"
,
hr
);
return
hr
;
}
return
S_OK
;
}
static
HRESULT
CDECL
device_parent_create_swapchain
(
struct
wined3d_device_parent
*
device_parent
,
static
HRESULT
CDECL
device_parent_create_swapchain
(
struct
wined3d_device_parent
*
device_parent
,
struct
wined3d_swapchain_desc
*
desc
,
struct
wined3d_swapchain
**
swapchain
)
struct
wined3d_swapchain_desc
*
desc
,
struct
wined3d_swapchain
**
swapchain
)
{
{
...
@@ -1942,8 +1931,8 @@ static const struct wined3d_device_parent_ops d3d10_wined3d_device_parent_ops =
...
@@ -1942,8 +1931,8 @@ static const struct wined3d_device_parent_ops d3d10_wined3d_device_parent_ops =
device_parent_wined3d_device_created
,
device_parent_wined3d_device_created
,
device_parent_mode_changed
,
device_parent_mode_changed
,
device_parent_surface_created
,
device_parent_surface_created
,
device_parent_volume_created
,
device_parent_create_swapchain_surface
,
device_parent_create_swapchain_surface
,
device_parent_create_volume
,
device_parent_create_swapchain
,
device_parent_create_swapchain
,
};
};
...
...
dlls/d3d8/d3d8_private.h
View file @
15c1a26b
...
@@ -183,9 +183,8 @@ struct d3d8_volume
...
@@ -183,9 +183,8 @@ struct d3d8_volume
IUnknown
*
forwardReference
;
IUnknown
*
forwardReference
;
};
};
HRESULT
volume_init
(
struct
d3d8_volume
*
volume
,
struct
d3d8_device
*
device
,
UINT
width
,
UINT
height
,
void
volume_init
(
struct
d3d8_volume
*
volume
,
struct
wined3d_volume
*
wined3d_volume
,
UINT
depth
,
UINT
level
,
DWORD
usage
,
enum
wined3d_format_id
format
,
const
struct
wined3d_parent_ops
**
parent_ops
)
DECLSPEC_HIDDEN
;
enum
wined3d_pool
pool
)
DECLSPEC_HIDDEN
;
struct
d3d8_swapchain
struct
d3d8_swapchain
{
{
...
...
dlls/d3d8/device.c
View file @
15c1a26b
...
@@ -2951,6 +2951,30 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent
...
@@ -2951,6 +2951,30 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent
return
D3D_OK
;
return
D3D_OK
;
}
}
static
HRESULT
CDECL
device_parent_volume_created
(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
struct
wined3d_volume
*
volume
,
void
**
parent
,
const
struct
wined3d_parent_ops
**
parent_ops
)
{
struct
d3d8_volume
*
d3d_volume
;
TRACE
(
"device_parent %p, container_parent %p, volume %p, parent %p, parent_ops %p.
\n
"
,
device_parent
,
container_parent
,
volume
,
parent
,
parent_ops
);
if
(
!
(
d3d_volume
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
*
d3d_volume
))))
return
E_OUTOFMEMORY
;
volume_init
(
d3d_volume
,
volume
,
parent_ops
);
*
parent
=
d3d_volume
;
TRACE
(
"Created volume %p.
\n
"
,
d3d_volume
);
d3d_volume
->
container
=
container_parent
;
IDirect3DVolume8_Release
(
&
d3d_volume
->
IDirect3DVolume8_iface
);
d3d_volume
->
forwardReference
=
container_parent
;
return
D3D_OK
;
}
static
HRESULT
CDECL
device_parent_create_swapchain_surface
(
struct
wined3d_device_parent
*
device_parent
,
static
HRESULT
CDECL
device_parent_create_swapchain_surface
(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
const
struct
wined3d_resource_desc
*
desc
,
struct
wined3d_surface
**
surface
)
void
*
container_parent
,
const
struct
wined3d_resource_desc
*
desc
,
struct
wined3d_surface
**
surface
)
{
{
...
@@ -2983,48 +3007,6 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic
...
@@ -2983,48 +3007,6 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic
return
hr
;
return
hr
;
}
}
static
HRESULT
CDECL
device_parent_create_volume
(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
UINT
width
,
UINT
height
,
UINT
depth
,
UINT
level
,
enum
wined3d_format_id
format
,
enum
wined3d_pool
pool
,
DWORD
usage
,
struct
wined3d_volume
**
volume
)
{
struct
d3d8_device
*
device
=
device_from_device_parent
(
device_parent
);
struct
d3d8_volume
*
object
;
HRESULT
hr
;
TRACE
(
"device_parent %p, container_parent %p, width %u, height %u, depth %u, "
"format %#x, pool %#x, usage %#x, volume %p.
\n
"
,
device_parent
,
container_parent
,
width
,
height
,
depth
,
format
,
pool
,
usage
,
volume
);
/* Allocate the storage for the device */
object
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
*
object
));
if
(
!
object
)
{
FIXME
(
"Allocation of memory failed
\n
"
);
*
volume
=
NULL
;
return
D3DERR_OUTOFVIDEOMEMORY
;
}
hr
=
volume_init
(
object
,
device
,
width
,
height
,
depth
,
level
,
usage
,
format
,
pool
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to initialize volume, hr %#x.
\n
"
,
hr
);
HeapFree
(
GetProcessHeap
(),
0
,
object
);
return
hr
;
}
*
volume
=
object
->
wined3d_volume
;
wined3d_volume_incref
(
*
volume
);
IDirect3DVolume8_Release
(
&
object
->
IDirect3DVolume8_iface
);
object
->
container
=
container_parent
;
object
->
forwardReference
=
container_parent
;
TRACE
(
"Created volume %p.
\n
"
,
object
);
return
hr
;
}
static
HRESULT
CDECL
device_parent_create_swapchain
(
struct
wined3d_device_parent
*
device_parent
,
static
HRESULT
CDECL
device_parent_create_swapchain
(
struct
wined3d_device_parent
*
device_parent
,
struct
wined3d_swapchain_desc
*
desc
,
struct
wined3d_swapchain
**
swapchain
)
struct
wined3d_swapchain_desc
*
desc
,
struct
wined3d_swapchain
**
swapchain
)
{
{
...
@@ -3053,8 +3035,8 @@ static const struct wined3d_device_parent_ops d3d8_wined3d_device_parent_ops =
...
@@ -3053,8 +3035,8 @@ static const struct wined3d_device_parent_ops d3d8_wined3d_device_parent_ops =
device_parent_wined3d_device_created
,
device_parent_wined3d_device_created
,
device_parent_mode_changed
,
device_parent_mode_changed
,
device_parent_surface_created
,
device_parent_surface_created
,
device_parent_volume_created
,
device_parent_create_swapchain_surface
,
device_parent_create_swapchain_surface
,
device_parent_create_volume
,
device_parent_create_swapchain
,
device_parent_create_swapchain
,
};
};
...
...
dlls/d3d8/volume.c
View file @
15c1a26b
...
@@ -283,21 +283,13 @@ static const struct wined3d_parent_ops d3d8_volume_wined3d_parent_ops =
...
@@ -283,21 +283,13 @@ static const struct wined3d_parent_ops d3d8_volume_wined3d_parent_ops =
volume_wined3d_object_destroyed
,
volume_wined3d_object_destroyed
,
};
};
HRESULT
volume_init
(
struct
d3d8_volume
*
volume
,
struct
d3d8_device
*
device
,
UINT
width
,
UINT
height
,
void
volume_init
(
struct
d3d8_volume
*
volume
,
struct
wined3d_volume
*
wined3d_volume
,
UINT
depth
,
UINT
level
,
DWORD
usage
,
enum
wined3d_format_id
format
,
enum
wined3d_pool
pool
)
const
struct
wined3d_parent_ops
**
parent_ops
)
{
{
HRESULT
hr
;
volume
->
IDirect3DVolume8_iface
.
lpVtbl
=
&
d3d8_volume_vtbl
;
volume
->
IDirect3DVolume8_iface
.
lpVtbl
=
&
d3d8_volume_vtbl
;
volume
->
refcount
=
1
;
volume
->
refcount
=
1
;
wined3d_volume_incref
(
wined3d_volume
);
volume
->
wined3d_volume
=
wined3d_volume
;
hr
=
wined3d_volume_create
(
device
->
wined3d_device
,
width
,
height
,
depth
,
level
,
usage
,
*
parent_ops
=
&
d3d8_volume_wined3d_parent_ops
;
format
,
pool
,
volume
,
&
d3d8_volume_wined3d_parent_ops
,
&
volume
->
wined3d_volume
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to create wined3d volume, hr %#x.
\n
"
,
hr
);
return
hr
;
}
return
D3D_OK
;
}
}
dlls/d3d9/d3d9_private.h
View file @
15c1a26b
...
@@ -175,9 +175,8 @@ struct d3d9_volume
...
@@ -175,9 +175,8 @@ struct d3d9_volume
IUnknown
*
forwardReference
;
IUnknown
*
forwardReference
;
};
};
HRESULT
volume_init
(
struct
d3d9_volume
*
volume
,
struct
d3d9_device
*
device
,
UINT
width
,
UINT
height
,
void
volume_init
(
struct
d3d9_volume
*
volume
,
struct
wined3d_volume
*
wined3d_volume
,
UINT
depth
,
UINT
level
,
DWORD
usage
,
enum
wined3d_format_id
format
,
const
struct
wined3d_parent_ops
**
parent_ops
)
DECLSPEC_HIDDEN
;
enum
wined3d_pool
pool
)
DECLSPEC_HIDDEN
;
struct
d3d9_swapchain
struct
d3d9_swapchain
{
{
...
...
dlls/d3d9/device.c
View file @
15c1a26b
...
@@ -3337,6 +3337,30 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent
...
@@ -3337,6 +3337,30 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent
return
D3D_OK
;
return
D3D_OK
;
}
}
static
HRESULT
CDECL
device_parent_volume_created
(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
struct
wined3d_volume
*
volume
,
void
**
parent
,
const
struct
wined3d_parent_ops
**
parent_ops
)
{
struct
d3d9_volume
*
d3d_volume
;
TRACE
(
"device_parent %p, container_parent %p, volume %p, parent %p, parent_ops %p.
\n
"
,
device_parent
,
container_parent
,
volume
,
parent
,
parent_ops
);
if
(
!
(
d3d_volume
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
*
d3d_volume
))))
return
E_OUTOFMEMORY
;
volume_init
(
d3d_volume
,
volume
,
parent_ops
);
*
parent
=
d3d_volume
;
TRACE
(
"Created volume %p.
\n
"
,
d3d_volume
);
d3d_volume
->
container
=
container_parent
;
IDirect3DVolume9_Release
(
&
d3d_volume
->
IDirect3DVolume9_iface
);
d3d_volume
->
forwardReference
=
container_parent
;
return
D3D_OK
;
}
static
HRESULT
CDECL
device_parent_create_swapchain_surface
(
struct
wined3d_device_parent
*
device_parent
,
static
HRESULT
CDECL
device_parent_create_swapchain_surface
(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
const
struct
wined3d_resource_desc
*
desc
,
struct
wined3d_surface
**
surface
)
void
*
container_parent
,
const
struct
wined3d_resource_desc
*
desc
,
struct
wined3d_surface
**
surface
)
{
{
...
@@ -3372,48 +3396,6 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic
...
@@ -3372,48 +3396,6 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic
return
hr
;
return
hr
;
}
}
static
HRESULT
CDECL
device_parent_create_volume
(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
UINT
width
,
UINT
height
,
UINT
depth
,
UINT
level
,
enum
wined3d_format_id
format
,
enum
wined3d_pool
pool
,
DWORD
usage
,
struct
wined3d_volume
**
volume
)
{
struct
d3d9_device
*
device
=
device_from_device_parent
(
device_parent
);
struct
d3d9_volume
*
object
;
HRESULT
hr
;
TRACE
(
"device_parent %p, container_parent %p, width %u, height %u, depth %u, "
"format %#x, pool %#x, usage %#x, volume %p
\n
"
,
device_parent
,
container_parent
,
width
,
height
,
depth
,
format
,
pool
,
usage
,
volume
);
/* Allocate the storage for the device */
object
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
*
object
));
if
(
!
object
)
{
FIXME
(
"Allocation of memory failed
\n
"
);
*
volume
=
NULL
;
return
D3DERR_OUTOFVIDEOMEMORY
;
}
hr
=
volume_init
(
object
,
device
,
width
,
height
,
depth
,
level
,
usage
,
format
,
pool
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to initialize volume, hr %#x.
\n
"
,
hr
);
HeapFree
(
GetProcessHeap
(),
0
,
object
);
return
hr
;
}
*
volume
=
object
->
wined3d_volume
;
wined3d_volume_incref
(
*
volume
);
IDirect3DVolume9_Release
(
&
object
->
IDirect3DVolume9_iface
);
object
->
container
=
container_parent
;
object
->
forwardReference
=
container_parent
;
TRACE
(
"Created volume %p.
\n
"
,
object
);
return
hr
;
}
static
HRESULT
CDECL
device_parent_create_swapchain
(
struct
wined3d_device_parent
*
device_parent
,
static
HRESULT
CDECL
device_parent_create_swapchain
(
struct
wined3d_device_parent
*
device_parent
,
struct
wined3d_swapchain_desc
*
desc
,
struct
wined3d_swapchain
**
swapchain
)
struct
wined3d_swapchain_desc
*
desc
,
struct
wined3d_swapchain
**
swapchain
)
{
{
...
@@ -3443,8 +3425,8 @@ static const struct wined3d_device_parent_ops d3d9_wined3d_device_parent_ops =
...
@@ -3443,8 +3425,8 @@ static const struct wined3d_device_parent_ops d3d9_wined3d_device_parent_ops =
device_parent_wined3d_device_created
,
device_parent_wined3d_device_created
,
device_parent_mode_changed
,
device_parent_mode_changed
,
device_parent_surface_created
,
device_parent_surface_created
,
device_parent_volume_created
,
device_parent_create_swapchain_surface
,
device_parent_create_swapchain_surface
,
device_parent_create_volume
,
device_parent_create_swapchain
,
device_parent_create_swapchain
,
};
};
...
...
dlls/d3d9/volume.c
View file @
15c1a26b
...
@@ -274,22 +274,13 @@ static const struct wined3d_parent_ops d3d9_volume_wined3d_parent_ops =
...
@@ -274,22 +274,13 @@ static const struct wined3d_parent_ops d3d9_volume_wined3d_parent_ops =
volume_wined3d_object_destroyed
,
volume_wined3d_object_destroyed
,
};
};
HRESULT
volume_init
(
struct
d3d9_volume
*
volume
,
struct
d3d9_device
*
device
,
UINT
width
,
UINT
height
,
void
volume_init
(
struct
d3d9_volume
*
volume
,
struct
wined3d_volume
*
wined3d_volume
,
UINT
depth
,
UINT
level
,
DWORD
usage
,
enum
wined3d_format_id
format
,
enum
wined3d_pool
pool
)
const
struct
wined3d_parent_ops
**
parent_ops
)
{
{
HRESULT
hr
;
volume
->
IDirect3DVolume9_iface
.
lpVtbl
=
&
d3d9_volume_vtbl
;
volume
->
IDirect3DVolume9_iface
.
lpVtbl
=
&
d3d9_volume_vtbl
;
volume
->
refcount
=
1
;
volume
->
refcount
=
1
;
wined3d_volume_incref
(
wined3d_volume
);
volume
->
wined3d_volume
=
wined3d_volume
;
hr
=
wined3d_volume_create
(
device
->
wined3d_device
,
width
,
height
,
depth
,
level
,
*
parent_ops
=
&
d3d9_volume_wined3d_parent_ops
;
usage
&
WINED3DUSAGE_MASK
,
format
,
pool
,
volume
,
&
d3d9_volume_wined3d_parent_ops
,
&
volume
->
wined3d_volume
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to create wined3d volume, hr %#x.
\n
"
,
hr
);
return
hr
;
}
return
D3D_OK
;
}
}
dlls/ddraw/ddraw.c
View file @
15c1a26b
...
@@ -4736,6 +4736,19 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent
...
@@ -4736,6 +4736,19 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent
return
DD_OK
;
return
DD_OK
;
}
}
static
HRESULT
CDECL
device_parent_volume_created
(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
struct
wined3d_volume
*
volume
,
void
**
parent
,
const
struct
wined3d_parent_ops
**
parent_ops
)
{
TRACE
(
"device_parent %p, container_parent %p, volume %p, parent %p, parent_ops %p.
\n
"
,
device_parent
,
container_parent
,
volume
,
parent
,
parent_ops
);
*
parent
=
NULL
;
*
parent_ops
=
&
ddraw_null_wined3d_parent_ops
;
return
DD_OK
;
}
static
void
STDMETHODCALLTYPE
ddraw_frontbuffer_destroyed
(
void
*
parent
)
static
void
STDMETHODCALLTYPE
ddraw_frontbuffer_destroyed
(
void
*
parent
)
{
{
struct
ddraw
*
ddraw
=
parent
;
struct
ddraw
*
ddraw
=
parent
;
...
@@ -4781,21 +4794,6 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic
...
@@ -4781,21 +4794,6 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic
return
hr
;
return
hr
;
}
}
static
HRESULT
CDECL
device_parent_create_volume
(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
UINT
width
,
UINT
height
,
UINT
depth
,
UINT
level
,
enum
wined3d_format_id
format
,
enum
wined3d_pool
pool
,
DWORD
usage
,
struct
wined3d_volume
**
volume
)
{
TRACE
(
"device_parent %p, container_parent %p, width %u, height %u, depth %u, "
"format %#x, pool %#x, usage %#x, volume %p.
\n
"
,
device_parent
,
container_parent
,
width
,
height
,
depth
,
format
,
pool
,
usage
,
volume
);
ERR
(
"Not implemented!
\n
"
);
return
E_NOTIMPL
;
}
static
HRESULT
CDECL
device_parent_create_swapchain
(
struct
wined3d_device_parent
*
device_parent
,
static
HRESULT
CDECL
device_parent_create_swapchain
(
struct
wined3d_device_parent
*
device_parent
,
struct
wined3d_swapchain_desc
*
desc
,
struct
wined3d_swapchain
**
swapchain
)
struct
wined3d_swapchain_desc
*
desc
,
struct
wined3d_swapchain
**
swapchain
)
{
{
...
@@ -4822,8 +4820,8 @@ static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops =
...
@@ -4822,8 +4820,8 @@ static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops =
device_parent_wined3d_device_created
,
device_parent_wined3d_device_created
,
device_parent_mode_changed
,
device_parent_mode_changed
,
device_parent_surface_created
,
device_parent_surface_created
,
device_parent_volume_created
,
device_parent_create_swapchain_surface
,
device_parent_create_swapchain_surface
,
device_parent_create_volume
,
device_parent_create_swapchain
,
device_parent_create_swapchain
,
};
};
...
...
dlls/wined3d/texture.c
View file @
15c1a26b
...
@@ -1112,10 +1112,8 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct
...
@@ -1112,10 +1112,8 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct
{
{
struct
wined3d_volume
*
volume
;
struct
wined3d_volume
*
volume
;
/* Create the volume. */
if
(
FAILED
(
hr
=
wined3d_volume_create
(
device
,
parent
,
tmp_w
,
tmp_h
,
tmp_d
,
i
,
hr
=
device
->
device_parent
->
ops
->
create_volume
(
device
->
device_parent
,
parent
,
desc
->
format
,
desc
->
usage
,
desc
->
pool
,
&
volume
)))
tmp_w
,
tmp_h
,
tmp_d
,
i
,
desc
->
format
,
desc
->
pool
,
desc
->
usage
,
&
volume
);
if
(
FAILED
(
hr
))
{
{
ERR
(
"Creating a volume for the volume texture failed, hr %#x.
\n
"
,
hr
);
ERR
(
"Creating a volume for the volume texture failed, hr %#x.
\n
"
,
hr
);
wined3d_texture_cleanup
(
texture
);
wined3d_texture_cleanup
(
texture
);
...
...
dlls/wined3d/volume.c
View file @
15c1a26b
...
@@ -812,9 +812,8 @@ static const struct wined3d_resource_ops volume_resource_ops =
...
@@ -812,9 +812,8 @@ static const struct wined3d_resource_ops volume_resource_ops =
volume_unload
,
volume_unload
,
};
};
static
HRESULT
volume_init
(
struct
wined3d_volume
*
volume
,
struct
wined3d_device
*
device
,
UINT
width
,
static
HRESULT
volume_init
(
struct
wined3d_volume
*
volume
,
struct
wined3d_device
*
device
,
UINT
width
,
UINT
height
,
UINT
height
,
UINT
depth
,
UINT
level
,
DWORD
usage
,
enum
wined3d_format_id
format_id
,
UINT
depth
,
UINT
level
,
DWORD
usage
,
enum
wined3d_format_id
format_id
,
enum
wined3d_pool
pool
)
enum
wined3d_pool
pool
,
void
*
parent
,
const
struct
wined3d_parent_ops
*
parent_ops
)
{
{
const
struct
wined3d_gl_info
*
gl_info
=
&
device
->
adapter
->
gl_info
;
const
struct
wined3d_gl_info
*
gl_info
=
&
device
->
adapter
->
gl_info
;
const
struct
wined3d_format
*
format
=
wined3d_get_format
(
gl_info
,
format_id
);
const
struct
wined3d_format
*
format
=
wined3d_get_format
(
gl_info
,
format_id
);
...
@@ -837,10 +836,9 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device
...
@@ -837,10 +836,9 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device
size
=
wined3d_format_calculate_size
(
format
,
device
->
surface_alignment
,
width
,
height
,
depth
);
size
=
wined3d_format_calculate_size
(
format
,
device
->
surface_alignment
,
width
,
height
,
depth
);
hr
=
resource_init
(
&
volume
->
resource
,
device
,
WINED3D_RTYPE_VOLUME
,
format
,
if
(
FAILED
(
hr
=
resource_init
(
&
volume
->
resource
,
device
,
WINED3D_RTYPE_VOLUME
,
format
,
WINED3D_MULTISAMPLE_NONE
,
0
,
usage
,
pool
,
width
,
height
,
depth
,
WINED3D_MULTISAMPLE_NONE
,
0
,
usage
,
pool
,
width
,
height
,
depth
,
size
,
parent
,
parent_ops
,
&
volume_resource_ops
);
size
,
NULL
,
&
wined3d_null_parent_ops
,
&
volume_resource_ops
)))
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to initialize resource, returning %#x.
\n
"
,
hr
);
WARN
(
"Failed to initialize resource, returning %#x.
\n
"
,
hr
);
return
hr
;
return
hr
;
...
@@ -860,16 +858,19 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device
...
@@ -860,16 +858,19 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device
return
WINED3D_OK
;
return
WINED3D_OK
;
}
}
HRESULT
CDECL
wined3d_volume_create
(
struct
wined3d_device
*
device
,
UINT
width
,
UINT
heigh
t
,
HRESULT
CDECL
wined3d_volume_create
(
struct
wined3d_device
*
device
,
void
*
container_paren
t
,
UINT
depth
,
UINT
level
,
DWORD
usage
,
enum
wined3d_format_id
format_id
,
enum
wined3d_pool
pool
,
UINT
width
,
UINT
height
,
UINT
depth
,
UINT
level
,
enum
wined3d_format_id
format_id
,
void
*
parent
,
const
struct
wined3d_parent_ops
*
parent_ops
,
struct
wined3d_volume
**
volume
)
DWORD
usage
,
enum
wined3d_pool
pool
,
struct
wined3d_volume
**
volume
)
{
{
const
struct
wined3d_parent_ops
*
parent_ops
;
struct
wined3d_volume
*
object
;
struct
wined3d_volume
*
object
;
void
*
parent
;
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"device %p, width %u, height %u, depth %u, usage %#x, format %s, pool %s
\n
"
,
TRACE
(
"device %p, container_parent %p, width %u, height %u, depth %u, level %u, format %s, "
device
,
width
,
height
,
depth
,
usage
,
debug_d3dformat
(
format_id
),
debug_d3dpool
(
pool
));
"usage %#x, pool %s, volume %p.
\n
"
,
TRACE
(
"parent %p, parent_ops %p, volume %p.
\n
"
,
parent
,
parent_ops
,
volume
);
device
,
container_parent
,
width
,
height
,
depth
,
level
,
debug_d3dformat
(
format_id
),
usage
,
debug_d3dpool
(
pool
),
volume
);
object
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
*
object
));
object
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
*
object
));
if
(
!
object
)
if
(
!
object
)
...
@@ -878,16 +879,25 @@ HRESULT CDECL wined3d_volume_create(struct wined3d_device *device, UINT width, U
...
@@ -878,16 +879,25 @@ HRESULT CDECL wined3d_volume_create(struct wined3d_device *device, UINT width, U
return
WINED3DERR_OUTOFVIDEOMEMORY
;
return
WINED3DERR_OUTOFVIDEOMEMORY
;
}
}
hr
=
volume_init
(
object
,
device
,
width
,
height
,
depth
,
level
,
if
(
FAILED
(
hr
=
volume_init
(
object
,
device
,
width
,
height
,
depth
,
level
,
usage
,
format_id
,
pool
)))
usage
,
format_id
,
pool
,
parent
,
parent_ops
);
if
(
FAILED
(
hr
))
{
{
WARN
(
"Failed to initialize volume, returning %#x.
\n
"
,
hr
);
WARN
(
"Failed to initialize volume, returning %#x.
\n
"
,
hr
);
HeapFree
(
GetProcessHeap
(),
0
,
object
);
HeapFree
(
GetProcessHeap
(),
0
,
object
);
return
hr
;
return
hr
;
}
}
TRACE
(
"Created volume %p.
\n
"
,
object
);
if
(
FAILED
(
hr
=
device
->
device_parent
->
ops
->
volume_created
(
device
->
device_parent
,
container_parent
,
object
,
&
parent
,
&
parent_ops
)))
{
WARN
(
"Failed to create volume parent, hr %#x.
\n
"
,
hr
);
wined3d_volume_decref
(
object
);
return
hr
;
}
TRACE
(
"Created volume %p, parent %p, parent_ops %p.
\n
"
,
object
,
parent
,
parent_ops
);
object
->
resource
.
parent
=
parent
;
object
->
resource
.
parent_ops
=
parent_ops
;
*
volume
=
object
;
*
volume
=
object
;
return
WINED3D_OK
;
return
WINED3D_OK
;
...
...
dlls/wined3d/wined3d.spec
View file @
15c1a26b
...
@@ -272,7 +272,6 @@
...
@@ -272,7 +272,6 @@
@ cdecl wined3d_vertex_declaration_get_parent(ptr)
@ cdecl wined3d_vertex_declaration_get_parent(ptr)
@ cdecl wined3d_vertex_declaration_incref(ptr)
@ cdecl wined3d_vertex_declaration_incref(ptr)
@ cdecl wined3d_volume_create(ptr long long long long long long long ptr ptr ptr)
@ cdecl wined3d_volume_decref(ptr)
@ cdecl wined3d_volume_decref(ptr)
@ cdecl wined3d_volume_from_resource(ptr)
@ cdecl wined3d_volume_from_resource(ptr)
@ cdecl wined3d_volume_get_parent(ptr)
@ cdecl wined3d_volume_get_parent(ptr)
...
...
dlls/wined3d/wined3d_private.h
View file @
15c1a26b
...
@@ -2133,7 +2133,11 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc
...
@@ -2133,7 +2133,11 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc
return
CONTAINING_RECORD
(
resource
,
struct
wined3d_volume
,
resource
);
return
CONTAINING_RECORD
(
resource
,
struct
wined3d_volume
,
resource
);
}
}
void
wined3d_volume_load
(
struct
wined3d_volume
*
volume
,
struct
wined3d_context
*
context
,
BOOL
srgb_mode
)
DECLSPEC_HIDDEN
;
HRESULT
wined3d_volume_create
(
struct
wined3d_device
*
device
,
void
*
container_parent
,
UINT
width
,
UINT
height
,
UINT
depth
,
UINT
level
,
enum
wined3d_format_id
format_id
,
DWORD
usage
,
enum
wined3d_pool
pool
,
struct
wined3d_volume
**
volume
);
void
wined3d_volume_load
(
struct
wined3d_volume
*
volume
,
struct
wined3d_context
*
context
,
BOOL
srgb_mode
)
DECLSPEC_HIDDEN
;
void
volume_set_container
(
struct
wined3d_volume
*
volume
,
struct
wined3d_texture
*
container
)
DECLSPEC_HIDDEN
;
void
volume_set_container
(
struct
wined3d_volume
*
volume
,
struct
wined3d_texture
*
container
)
DECLSPEC_HIDDEN
;
void
wined3d_volume_invalidate_location
(
struct
wined3d_volume
*
volume
,
DWORD
location
)
DECLSPEC_HIDDEN
;
void
wined3d_volume_invalidate_location
(
struct
wined3d_volume
*
volume
,
DWORD
location
)
DECLSPEC_HIDDEN
;
void
wined3d_volume_upload_data
(
struct
wined3d_volume
*
volume
,
const
struct
wined3d_context
*
context
,
void
wined3d_volume_upload_data
(
struct
wined3d_volume
*
volume
,
const
struct
wined3d_context
*
context
,
...
...
include/wine/wined3d.h
View file @
15c1a26b
...
@@ -1982,11 +1982,10 @@ struct wined3d_device_parent_ops
...
@@ -1982,11 +1982,10 @@ struct wined3d_device_parent_ops
void
(
__cdecl
*
mode_changed
)(
struct
wined3d_device_parent
*
device_parent
);
void
(
__cdecl
*
mode_changed
)(
struct
wined3d_device_parent
*
device_parent
);
HRESULT
(
__cdecl
*
surface_created
)(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
HRESULT
(
__cdecl
*
surface_created
)(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
struct
wined3d_surface
*
surface
,
void
**
parent
,
const
struct
wined3d_parent_ops
**
parent_ops
);
struct
wined3d_surface
*
surface
,
void
**
parent
,
const
struct
wined3d_parent_ops
**
parent_ops
);
HRESULT
(
__cdecl
*
volume_created
)(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
struct
wined3d_volume
*
volume
,
void
**
parent
,
const
struct
wined3d_parent_ops
**
parent_ops
);
HRESULT
(
__cdecl
*
create_swapchain_surface
)(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
HRESULT
(
__cdecl
*
create_swapchain_surface
)(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
const
struct
wined3d_resource_desc
*
desc
,
struct
wined3d_surface
**
surface
);
const
struct
wined3d_resource_desc
*
desc
,
struct
wined3d_surface
**
surface
);
HRESULT
(
__cdecl
*
create_volume
)(
struct
wined3d_device_parent
*
device_parent
,
void
*
container_parent
,
UINT
width
,
UINT
height
,
UINT
depth
,
UINT
level
,
enum
wined3d_format_id
format_id
,
enum
wined3d_pool
pool
,
DWORD
usage
,
struct
wined3d_volume
**
volume
);
HRESULT
(
__cdecl
*
create_swapchain
)(
struct
wined3d_device_parent
*
device_parent
,
HRESULT
(
__cdecl
*
create_swapchain
)(
struct
wined3d_device_parent
*
device_parent
,
struct
wined3d_swapchain_desc
*
desc
,
struct
wined3d_swapchain
**
swapchain
);
struct
wined3d_swapchain_desc
*
desc
,
struct
wined3d_swapchain
**
swapchain
);
};
};
...
@@ -2396,9 +2395,6 @@ ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaratio
...
@@ -2396,9 +2395,6 @@ ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaratio
void
*
__cdecl
wined3d_vertex_declaration_get_parent
(
const
struct
wined3d_vertex_declaration
*
declaration
);
void
*
__cdecl
wined3d_vertex_declaration_get_parent
(
const
struct
wined3d_vertex_declaration
*
declaration
);
ULONG
__cdecl
wined3d_vertex_declaration_incref
(
struct
wined3d_vertex_declaration
*
declaration
);
ULONG
__cdecl
wined3d_vertex_declaration_incref
(
struct
wined3d_vertex_declaration
*
declaration
);
HRESULT
__cdecl
wined3d_volume_create
(
struct
wined3d_device
*
device
,
UINT
width
,
UINT
height
,
UINT
depth
,
UINT
level
,
DWORD
usage
,
enum
wined3d_format_id
format_id
,
enum
wined3d_pool
pool
,
void
*
parent
,
const
struct
wined3d_parent_ops
*
parent_ops
,
struct
wined3d_volume
**
volume
);
ULONG
__cdecl
wined3d_volume_decref
(
struct
wined3d_volume
*
volume
);
ULONG
__cdecl
wined3d_volume_decref
(
struct
wined3d_volume
*
volume
);
struct
wined3d_volume
*
__cdecl
wined3d_volume_from_resource
(
struct
wined3d_resource
*
resource
);
struct
wined3d_volume
*
__cdecl
wined3d_volume_from_resource
(
struct
wined3d_resource
*
resource
);
void
*
__cdecl
wined3d_volume_get_parent
(
const
struct
wined3d_volume
*
volume
);
void
*
__cdecl
wined3d_volume_get_parent
(
const
struct
wined3d_volume
*
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