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
5889f822
Commit
5889f822
authored
Nov 27, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Nov 27, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Move the flippable validation from CreateSurface() to ddraw_surface_create_texture().
parent
3139249a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
ddraw.c
dlls/ddraw/ddraw.c
+0
-8
surface.c
dlls/ddraw/surface.c
+8
-0
No files found.
dlls/ddraw/ddraw.c
View file @
5889f822
...
@@ -2855,14 +2855,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD,
...
@@ -2855,14 +2855,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD,
DDSD
->
dwFlags
&=
~
DDSD_LPSURFACE
;
DDSD
->
dwFlags
&=
~
DDSD_LPSURFACE
;
}
}
if
((
DDSD
->
ddsCaps
.
dwCaps
&
(
DDSCAPS_FLIP
|
DDSCAPS_PRIMARYSURFACE
))
==
(
DDSCAPS_FLIP
|
DDSCAPS_PRIMARYSURFACE
)
&&
!
(
ddraw
->
cooperative_level
&
DDSCL_EXCLUSIVE
))
{
WARN
(
"Attempted to create a flipable primary surface without DDSCL_EXCLUSIVE.
\n
"
);
return
DDERR_NOEXCLUSIVEMODE
;
}
/* Modify some flags */
/* Modify some flags */
copy_to_surfacedesc2
(
&
desc2
,
DDSD
);
copy_to_surfacedesc2
(
&
desc2
,
DDSD
);
...
...
dlls/ddraw/surface.c
View file @
5889f822
...
@@ -5608,6 +5608,14 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc,
...
@@ -5608,6 +5608,14 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc,
DDRAW_dump_surface_desc
(
desc
);
DDRAW_dump_surface_desc
(
desc
);
}
}
if
((
desc
->
ddsCaps
.
dwCaps
&
(
DDSCAPS_FLIP
|
DDSCAPS_PRIMARYSURFACE
))
==
(
DDSCAPS_FLIP
|
DDSCAPS_PRIMARYSURFACE
)
&&
!
(
ddraw
->
cooperative_level
&
DDSCL_EXCLUSIVE
))
{
WARN
(
"Tried to create a flippable primary surface without DDSCL_EXCLUSIVE.
\n
"
);
return
DDERR_NOEXCLUSIVEMODE
;
}
if
((
desc
->
ddsCaps
.
dwCaps
&
(
DDSCAPS_BACKBUFFER
|
DDSCAPS_PRIMARYSURFACE
))
if
((
desc
->
ddsCaps
.
dwCaps
&
(
DDSCAPS_BACKBUFFER
|
DDSCAPS_PRIMARYSURFACE
))
==
(
DDSCAPS_BACKBUFFER
|
DDSCAPS_PRIMARYSURFACE
))
==
(
DDSCAPS_BACKBUFFER
|
DDSCAPS_PRIMARYSURFACE
))
{
{
...
...
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