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
ff659522
Commit
ff659522
authored
Oct 24, 2010
by
Ričardas Barkauskas
Committed by
Alexandre Julliard
Oct 25, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Fix DDSCAPS_3DDEVICE surfaces always setting DDSCAPS_VISIBLE.
parent
7402761e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
surface.c
dlls/ddraw/surface.c
+6
-1
d3d.c
dlls/ddraw/tests/d3d.c
+1
-1
dsurface.c
dlls/ddraw/tests/dsurface.c
+2
-2
No files found.
dlls/ddraw/surface.c
View file @
ff659522
...
@@ -3511,12 +3511,17 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr
...
@@ -3511,12 +3511,17 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr
desc
->
ddsCaps
.
dwCaps
|=
DDSCAPS_LOCALVIDMEM
|
DDSCAPS_VIDEOMEMORY
;
desc
->
ddsCaps
.
dwCaps
|=
DDSCAPS_LOCALVIDMEM
|
DDSCAPS_VIDEOMEMORY
;
}
}
if
(
desc
->
ddsCaps
.
dwCaps
&
(
DDSCAPS_PRIMARYSURFACE
|
DDSCAPS_3DDEVICE
)
)
if
(
desc
->
ddsCaps
.
dwCaps
&
DDSCAPS_PRIMARYSURFACE
)
{
{
usage
|=
WINED3DUSAGE_RENDERTARGET
;
usage
|=
WINED3DUSAGE_RENDERTARGET
;
desc
->
ddsCaps
.
dwCaps
|=
DDSCAPS_VISIBLE
;
desc
->
ddsCaps
.
dwCaps
|=
DDSCAPS_VISIBLE
;
}
}
if
(
desc
->
ddsCaps
.
dwCaps
&
DDSCAPS_3DDEVICE
)
{
usage
|=
WINED3DUSAGE_RENDERTARGET
;
}
if
(
desc
->
ddsCaps
.
dwCaps
&
(
DDSCAPS_OVERLAY
))
if
(
desc
->
ddsCaps
.
dwCaps
&
(
DDSCAPS_OVERLAY
))
{
{
usage
|=
WINED3DUSAGE_OVERLAY
;
usage
|=
WINED3DUSAGE_OVERLAY
;
...
...
dlls/ddraw/tests/d3d.c
View file @
ff659522
...
@@ -3593,7 +3593,7 @@ static void BackBuffer3DCreateSurfaceTest(void)
...
@@ -3593,7 +3593,7 @@ static void BackBuffer3DCreateSurfaceTest(void)
{
{
hr
=
IDirectDrawSurface_GetSurfaceDesc
(
surf
,
&
created_ddsd
);
hr
=
IDirectDrawSurface_GetSurfaceDesc
(
surf
,
&
created_ddsd
);
ok
(
SUCCEEDED
(
hr
),
"IDirectDraw_GetSurfaceDesc failed: 0x%08x
\n
"
,
hr
);
ok
(
SUCCEEDED
(
hr
),
"IDirectDraw_GetSurfaceDesc failed: 0x%08x
\n
"
,
hr
);
todo_wine
ok
(
created_ddsd
.
ddsCaps
.
dwCaps
==
expected_caps
,
ok
(
created_ddsd
.
ddsCaps
.
dwCaps
==
expected_caps
,
"GetSurfaceDesc returned caps %x, expected %x
\n
"
,
created_ddsd
.
ddsCaps
.
dwCaps
,
"GetSurfaceDesc returned caps %x, expected %x
\n
"
,
created_ddsd
.
ddsCaps
.
dwCaps
,
expected_caps
);
expected_caps
);
...
...
dlls/ddraw/tests/dsurface.c
View file @
ff659522
...
@@ -2916,7 +2916,7 @@ static void SurfaceCapsTest(void)
...
@@ -2916,7 +2916,7 @@ static void SurfaceCapsTest(void)
hr
=
IDirectDrawSurface_GetSurfaceDesc
(
surface1
,
&
desc
);
hr
=
IDirectDrawSurface_GetSurfaceDesc
(
surface1
,
&
desc
);
ok
(
hr
==
DD_OK
,
"IDirectDrawSurface_GetSurfaceDesc failed with %08x
\n
"
,
hr
);
ok
(
hr
==
DD_OK
,
"IDirectDrawSurface_GetSurfaceDesc failed with %08x
\n
"
,
hr
);
if
(
!
(
create_caps
[
i
]
&
(
DDSCAPS_PRIMARYSURFACE
|
DDSCAPS_3DDEVICE
)
))
if
(
!
(
create_caps
[
i
]
&
DDSCAPS_PRIMARYSURFACE
))
ok
(
desc
.
ddsCaps
.
dwCaps
==
expected_caps
[
i
],
ok
(
desc
.
ddsCaps
.
dwCaps
==
expected_caps
[
i
],
"GetSurfaceDesc test %d returned caps %x, expected %x
\n
"
,
i
,
"GetSurfaceDesc test %d returned caps %x, expected %x
\n
"
,
i
,
desc
.
ddsCaps
.
dwCaps
,
expected_caps
[
i
]);
desc
.
ddsCaps
.
dwCaps
,
expected_caps
[
i
]);
...
@@ -2971,7 +2971,7 @@ static void SurfaceCapsTest(void)
...
@@ -2971,7 +2971,7 @@ static void SurfaceCapsTest(void)
hr
=
IDirectDrawSurface7_GetSurfaceDesc
(
surface7
,
&
desc2
);
hr
=
IDirectDrawSurface7_GetSurfaceDesc
(
surface7
,
&
desc2
);
ok
(
hr
==
DD_OK
,
"IDirectDrawSurface_GetSurfaceDesc failed with %08x
\n
"
,
hr
);
ok
(
hr
==
DD_OK
,
"IDirectDrawSurface_GetSurfaceDesc failed with %08x
\n
"
,
hr
);
if
(
!
(
create_caps
[
i
]
&
(
DDSCAPS_PRIMARYSURFACE
|
DDSCAPS_3DDEVICE
)
))
if
(
!
(
create_caps
[
i
]
&
DDSCAPS_PRIMARYSURFACE
))
ok
(
desc2
.
ddsCaps
.
dwCaps
==
expected_caps
[
i
],
ok
(
desc2
.
ddsCaps
.
dwCaps
==
expected_caps
[
i
],
"GetSurfaceDesc test %d returned caps %x, expected %x
\n
"
,
i
,
"GetSurfaceDesc test %d returned caps %x, expected %x
\n
"
,
i
,
desc2
.
ddsCaps
.
dwCaps
,
expected_caps
[
i
]);
desc2
.
ddsCaps
.
dwCaps
,
expected_caps
[
i
]);
...
...
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