Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
07712448
Commit
07712448
authored
Mar 07, 2016
by
Stefan Dösinger
Committed by
Alexandre Julliard
Mar 08, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Call wined3d_surface_prepare() in surface_load_sysmem().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
9f17f922
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
7 deletions
+3
-7
surface.c
dlls/wined3d/surface.c
+3
-6
texture.c
dlls/wined3d/texture.c
+0
-1
No files found.
dlls/wined3d/surface.c
View file @
07712448
...
...
@@ -1020,7 +1020,6 @@ static void surface_unload(struct wined3d_resource *resource)
}
else
{
wined3d_surface_prepare
(
surface
,
context
,
surface
->
resource
.
map_binding
);
surface_load_location
(
surface
,
context
,
surface
->
resource
.
map_binding
);
surface_invalidate_location
(
surface
,
~
surface
->
resource
.
map_binding
);
}
...
...
@@ -2194,11 +2193,11 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_
gl_info
=
context
->
gl_info
;
}
wined3d_surface_prepare
(
surface
,
context
,
surface
->
resource
.
map_binding
);
if
(
flags
&
WINED3D_MAP_DISCARD
)
{
TRACE
(
"WINED3D_MAP_DISCARD flag passed, marking %s as up to date.
\n
"
,
wined3d_debug_location
(
surface
->
resource
.
map_binding
));
wined3d_surface_prepare
(
surface
,
context
,
surface
->
resource
.
map_binding
);
surface_validate_location
(
surface
,
surface
->
resource
.
map_binding
);
}
else
...
...
@@ -3463,6 +3462,8 @@ static void surface_load_sysmem(struct wined3d_surface *surface,
{
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
wined3d_surface_prepare
(
surface
,
context
,
dst_location
);
if
(
surface
->
locations
&
surface_simple_locations
)
{
surface_copy_simple_location
(
surface
,
dst_location
);
...
...
@@ -3578,7 +3579,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
{
/* Performance warning... */
FIXME
(
"Downloading RGB surface %p to reload it as sRGB.
\n
"
,
surface
);
wined3d_surface_prepare
(
surface
,
context
,
surface
->
resource
.
map_binding
);
surface_load_location
(
surface
,
context
,
surface
->
resource
.
map_binding
);
}
}
...
...
@@ -3589,7 +3589,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
{
/* Performance warning... */
FIXME
(
"Downloading sRGB surface %p to reload it as RGB.
\n
"
,
surface
);
wined3d_surface_prepare
(
surface
,
context
,
surface
->
resource
.
map_binding
);
surface_load_location
(
surface
,
context
,
surface
->
resource
.
map_binding
);
}
}
...
...
@@ -3598,7 +3597,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
{
WARN
(
"Trying to load a texture from sysmem, but no simple location is valid.
\n
"
);
/* Lets hope we get it from somewhere... */
surface_prepare_system_memory
(
surface
);
surface_load_location
(
surface
,
context
,
WINED3D_LOCATION_SYSMEM
);
}
...
...
@@ -3625,7 +3623,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
else
surface
->
resource
.
map_binding
=
WINED3D_LOCATION_SYSMEM
;
wined3d_surface_prepare
(
surface
,
context
,
surface
->
resource
.
map_binding
);
surface_load_location
(
surface
,
context
,
surface
->
resource
.
map_binding
);
wined3d_texture_remove_buffer_object
(
texture
,
surface_get_sub_resource_idx
(
surface
),
gl_info
);
}
...
...
dlls/wined3d/texture.c
View file @
07712448
...
...
@@ -853,7 +853,6 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub
struct
wined3d_context
*
context
;
context
=
context_acquire
(
surface
->
container
->
resource
.
device
,
NULL
);
wined3d_surface_prepare
(
surface
,
context
,
sub_resource
->
map_binding
);
surface_load_location
(
surface
,
context
,
sub_resource
->
map_binding
);
context_release
(
context
);
surface_invalidate_location
(
surface
,
~
sub_resource
->
map_binding
);
...
...
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