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
caff742d
Commit
caff742d
authored
Aug 26, 2011
by
Stefan Dösinger
Committed by
Alexandre Julliard
Aug 29, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Trust wined3d to give us what we asked for.
parent
30d9926a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
13 deletions
+2
-13
surface.c
dlls/ddraw/surface.c
+2
-13
No files found.
dlls/ddraw/surface.c
View file @
caff742d
...
...
@@ -5112,8 +5112,6 @@ HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface)
HRESULT
ddraw_surface_init
(
IDirectDrawSurfaceImpl
*
surface
,
IDirectDrawImpl
*
ddraw
,
DDSURFACEDESC2
*
desc
,
UINT
mip_level
,
WINED3DSURFTYPE
surface_type
,
UINT
version
)
{
struct
wined3d_resource_desc
wined3d_desc
;
struct
wined3d_resource
*
wined3d_resource
;
WINED3DPOOL
pool
=
WINED3DPOOL_DEFAULT
;
enum
wined3d_format_id
format
;
DWORD
usage
=
0
;
...
...
@@ -5215,15 +5213,6 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr
return
hr
;
}
wined3d_resource
=
wined3d_surface_get_resource
(
surface
->
wined3d_surface
);
wined3d_resource_get_desc
(
wined3d_resource
,
&
wined3d_desc
);
format
=
wined3d_desc
.
format
;
if
(
format
==
WINED3DFMT_UNKNOWN
)
{
FIXME
(
"IWineD3DSurface::GetDesc returned WINED3DFMT_UNKNOWN.
\n
"
);
}
/* Anno 1602 stores the pitch right after surface creation, so make sure
* it's there. TODO: Test other fourcc formats. */
if
(
format
==
WINED3DFMT_DXT1
||
format
==
WINED3DFMT_DXT2
||
format
==
WINED3DFMT_DXT3
...
...
@@ -5232,11 +5221,11 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr
surface
->
surface_desc
.
dwFlags
|=
DDSD_LINEARSIZE
;
if
(
format
==
WINED3DFMT_DXT1
)
{
surface
->
surface_desc
.
u1
.
dwLinearSize
=
max
(
4
,
wined3d_desc
.
width
)
*
max
(
4
,
wined3d_desc
.
h
eight
)
/
2
;
surface
->
surface_desc
.
u1
.
dwLinearSize
=
max
(
4
,
desc
->
dwWidth
)
*
max
(
4
,
desc
->
dwH
eight
)
/
2
;
}
else
{
surface
->
surface_desc
.
u1
.
dwLinearSize
=
max
(
4
,
wined3d_desc
.
width
)
*
max
(
4
,
wined3d_desc
.
h
eight
);
surface
->
surface_desc
.
u1
.
dwLinearSize
=
max
(
4
,
desc
->
dwWidth
)
*
max
(
4
,
desc
->
dwH
eight
);
}
}
else
...
...
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