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
06e6b164
Commit
06e6b164
authored
Dec 24, 2022
by
Zebediah Figura
Committed by
Alexandre Julliard
Mar 16, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Rename ddraw_surface_create_wined3d_texture() to ddraw_texture_init().
parent
d4072dc8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
+4
-7
surface.c
dlls/ddraw/surface.c
+4
-7
No files found.
dlls/ddraw/surface.c
View file @
06e6b164
...
...
@@ -6049,9 +6049,8 @@ static bool need_draw_texture(unsigned int draw_bind_flags, const struct wined3d
return
true
;
}
static
HRESULT
ddraw_surface_create_wined3d_texture
(
struct
ddraw
*
ddraw
,
unsigned
int
layers
,
unsigned
int
levels
,
struct
ddraw_texture
*
texture
,
bool
sysmem_fallback
,
bool
reserve_memory
)
static
HRESULT
ddraw_texture_init
(
struct
ddraw_texture
*
texture
,
struct
ddraw
*
ddraw
,
unsigned
int
layers
,
unsigned
int
levels
,
bool
sysmem_fallback
,
bool
reserve_memory
)
{
struct
wined3d_device
*
wined3d_device
=
ddraw
->
wined3d_device
;
const
DDSURFACEDESC2
*
desc
=
&
texture
->
surface_desc
;
...
...
@@ -6734,8 +6733,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
&&
desc
->
ddsCaps
.
dwCaps
&
DDSCAPS_VIDEOMEMORY
&&
wined3d_display_mode_format
.
u1
.
dwRGBBitCount
<=
16
;
if
(
FAILED
(
hr
=
ddraw_surface_create_wined3d_texture
(
ddraw
,
layers
,
levels
,
texture
,
sysmem_fallback
,
reserve_memory
)))
if
(
FAILED
(
hr
=
ddraw_texture_init
(
texture
,
ddraw
,
layers
,
levels
,
sysmem_fallback
,
reserve_memory
)))
{
WARN
(
"Failed to create wined3d texture, hr %#lx.
\n
"
,
hr
);
heap_free
(
texture
);
...
...
@@ -6772,8 +6770,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
desc
->
ddsCaps
.
dwCaps
|=
DDSCAPS_BACKBUFFER
;
desc
->
u5
.
dwBackBufferCount
=
0
;
if
(
FAILED
(
hr
=
ddraw_surface_create_wined3d_texture
(
ddraw
,
1
,
1
,
texture
,
sysmem_fallback
,
reserve_memory
)))
if
(
FAILED
(
hr
=
ddraw_texture_init
(
texture
,
ddraw
,
1
,
1
,
sysmem_fallback
,
reserve_memory
)))
{
heap_free
(
texture
);
hr
=
hr_ddraw_from_wined3d
(
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