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
bdfee157
Commit
bdfee157
authored
Aug 03, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 03, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use wined3d_texture_load_location() in surface_load_texture().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
1091de5c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
surface.c
dlls/wined3d/surface.c
+4
-4
No files found.
dlls/wined3d/surface.c
View file @
bdfee157
...
@@ -2908,7 +2908,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
...
@@ -2908,7 +2908,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
==
WINED3D_LOCATION_TEXTURE_RGB
)
==
WINED3D_LOCATION_TEXTURE_RGB
)
{
{
FIXME_
(
d3d_perf
)(
"Downloading RGB surface %p to reload it as sRGB.
\n
"
,
surface
);
FIXME_
(
d3d_perf
)(
"Downloading RGB surface %p to reload it as sRGB.
\n
"
,
surface
);
surface_load_location
(
surface
,
context
,
texture
->
resource
.
map_binding
);
wined3d_texture_load_location
(
texture
,
sub_resource_idx
,
context
,
texture
->
resource
.
map_binding
);
}
}
}
}
else
else
...
@@ -2917,7 +2917,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
...
@@ -2917,7 +2917,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
==
WINED3D_LOCATION_TEXTURE_SRGB
)
==
WINED3D_LOCATION_TEXTURE_SRGB
)
{
{
FIXME_
(
d3d_perf
)(
"Downloading sRGB surface %p to reload it as RGB.
\n
"
,
surface
);
FIXME_
(
d3d_perf
)(
"Downloading sRGB surface %p to reload it as RGB.
\n
"
,
surface
);
surface_load_location
(
surface
,
context
,
texture
->
resource
.
map_binding
);
wined3d_texture_load_location
(
texture
,
sub_resource_idx
,
context
,
texture
->
resource
.
map_binding
);
}
}
}
}
...
@@ -2925,7 +2925,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
...
@@ -2925,7 +2925,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
{
{
WARN
(
"Trying to load a texture from sysmem, but no simple location is valid.
\n
"
);
WARN
(
"Trying to load a texture from sysmem, but no simple location is valid.
\n
"
);
/* Lets hope we get it from somewhere... */
/* Lets hope we get it from somewhere... */
surface_load_location
(
surface
,
context
,
WINED3D_LOCATION_SYSMEM
);
wined3d_texture_load_location
(
texture
,
sub_resource_idx
,
context
,
WINED3D_LOCATION_SYSMEM
);
}
}
wined3d_texture_prepare_texture
(
texture
,
context
,
srgb
);
wined3d_texture_prepare_texture
(
texture
,
context
,
srgb
);
...
@@ -2943,7 +2943,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
...
@@ -2943,7 +2943,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
{
{
TRACE
(
"Removing the pbo attached to surface %p.
\n
"
,
surface
);
TRACE
(
"Removing the pbo attached to surface %p.
\n
"
,
surface
);
surface_load_location
(
surface
,
context
,
WINED3D_LOCATION_SYSMEM
);
wined3d_texture_load_location
(
texture
,
sub_resource_idx
,
context
,
WINED3D_LOCATION_SYSMEM
);
wined3d_texture_set_map_binding
(
texture
,
WINED3D_LOCATION_SYSMEM
);
wined3d_texture_set_map_binding
(
texture
,
WINED3D_LOCATION_SYSMEM
);
}
}
...
...
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