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
8a5b4252
Commit
8a5b4252
authored
Apr 10, 2023
by
Zebediah Figura
Committed by
Alexandre Julliard
Apr 26, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d9: Move surface allocation to d3d9_surface_create().
Renamed from d3d9_surface_init() accordingly.
parent
7b7d26a7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
d3d9_private.h
dlls/d3d9/d3d9_private.h
+2
-2
device.c
dlls/d3d9/device.c
+1
-3
surface.c
dlls/d3d9/surface.c
+8
-1
No files found.
dlls/d3d9/d3d9_private.h
View file @
8a5b4252
...
...
@@ -179,11 +179,11 @@ struct d3d9_surface
};
struct
wined3d_rendertarget_view
*
d3d9_surface_acquire_rendertarget_view
(
struct
d3d9_surface
*
surface
)
DECLSPEC_HIDDEN
;
struct
d3d9_surface
*
d3d9_surface_create
(
struct
wined3d_texture
*
wined3d_texture
,
unsigned
int
sub_resource_idx
,
const
struct
wined3d_parent_ops
**
parent_ops
)
DECLSPEC_HIDDEN
;
struct
d3d9_device
*
d3d9_surface_get_device
(
const
struct
d3d9_surface
*
surface
)
DECLSPEC_HIDDEN
;
void
d3d9_surface_release_rendertarget_view
(
struct
d3d9_surface
*
surface
,
struct
wined3d_rendertarget_view
*
rtv
)
DECLSPEC_HIDDEN
;
void
surface_init
(
struct
d3d9_surface
*
surface
,
struct
wined3d_texture
*
wined3d_texture
,
unsigned
int
sub_resource_idx
,
const
struct
wined3d_parent_ops
**
parent_ops
)
DECLSPEC_HIDDEN
;
struct
d3d9_surface
*
unsafe_impl_from_IDirect3DSurface9
(
IDirect3DSurface9
*
iface
)
DECLSPEC_HIDDEN
;
struct
d3d9_vertexbuffer
...
...
dlls/d3d9/device.c
View file @
8a5b4252
...
...
@@ -4502,12 +4502,10 @@ static HRESULT CDECL device_parent_texture_sub_resource_created(struct wined3d_d
{
struct
d3d9_surface
*
d3d_surface
;
if
(
!
(
d3d_surface
=
heap_alloc_zero
(
sizeof
(
*
d3d_surface
)
)))
if
(
!
(
d3d_surface
=
d3d9_surface_create
(
wined3d_texture
,
sub_resource_idx
,
parent_ops
)))
return
E_OUTOFMEMORY
;
surface_init
(
d3d_surface
,
wined3d_texture
,
sub_resource_idx
,
parent_ops
);
*
parent
=
d3d_surface
;
TRACE
(
"Created surface %p.
\n
"
,
d3d_surface
);
}
else
if
(
type
==
WINED3D_RTYPE_TEXTURE_3D
)
{
...
...
dlls/d3d9/surface.c
View file @
8a5b4252
...
...
@@ -347,10 +347,14 @@ static const struct wined3d_parent_ops d3d9_surface_wined3d_parent_ops =
surface_wined3d_object_destroyed
,
};
void
surface_init
(
struct
d3d9_surface
*
surface
,
struct
wined3d_texture
*
wined3d_texture
,
struct
d3d9_surface
*
d3d9_surface_create
(
struct
wined3d_texture
*
wined3d_texture
,
unsigned
int
sub_resource_idx
,
const
struct
wined3d_parent_ops
**
parent_ops
)
{
IDirect3DBaseTexture9
*
texture
;
struct
d3d9_surface
*
surface
;
if
(
!
(
surface
=
heap_alloc_zero
(
sizeof
(
*
surface
))))
return
NULL
;
surface
->
IDirect3DSurface9_iface
.
lpVtbl
=
&
d3d9_surface_vtbl
;
d3d9_resource_init
(
&
surface
->
resource
);
...
...
@@ -368,6 +372,9 @@ void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_
}
*
parent_ops
=
&
d3d9_surface_wined3d_parent_ops
;
TRACE
(
"Created surface %p.
\n
"
,
surface
);
return
surface
;
}
static
void
STDMETHODCALLTYPE
view_wined3d_object_destroyed
(
void
*
parent
)
...
...
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