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
b55e3d82
Commit
b55e3d82
authored
Jan 10, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Jan 11, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Set SFLAG_PIN_SYSMEM when the application tries to use surfaces that are currently mapped.
parent
5112699a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
surface.c
dlls/wined3d/surface.c
+7
-1
No files found.
dlls/wined3d/surface.c
View file @
b55e3d82
...
...
@@ -2283,7 +2283,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct
/* This call just uploads data, the caller is responsible for binding the
* correct texture. */
/* Context activation is done by the caller. */
static
void
surface_upload_data
(
const
struct
wined3d_surface
*
surface
,
const
struct
wined3d_gl_info
*
gl_info
,
static
void
surface_upload_data
(
struct
wined3d_surface
*
surface
,
const
struct
wined3d_gl_info
*
gl_info
,
const
struct
wined3d_format
*
format
,
const
RECT
*
src_rect
,
UINT
src_pitch
,
const
POINT
*
dst_point
,
BOOL
srgb
,
const
struct
wined3d_bo_address
*
data
)
{
...
...
@@ -2294,6 +2294,12 @@ static void surface_upload_data(const struct wined3d_surface *surface, const str
surface
,
gl_info
,
debug_d3dformat
(
format
->
id
),
wine_dbgstr_rect
(
src_rect
),
src_pitch
,
wine_dbgstr_point
(
dst_point
),
srgb
,
data
->
buffer_object
,
data
->
addr
);
if
(
surface
->
flags
&
SFLAG_LOCKED
)
{
WARN
(
"Uploading a surface that is currently mapped, setting SFLAG_PIN_SYSMEM.
\n
"
);
surface
->
flags
|=
SFLAG_PIN_SYSMEM
;
}
if
(
format
->
heightscale
!=
1
.
0
f
&&
format
->
heightscale
!=
0
.
0
f
)
update_h
*=
format
->
heightscale
;
...
...
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