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
fad52d78
Commit
fad52d78
authored
Mar 24, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Mar 25, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get resource info from the texture in surface_load_drawable().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
484f5f1e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
surface.c
dlls/wined3d/surface.c
+3
-2
No files found.
dlls/wined3d/surface.c
View file @
fad52d78
...
...
@@ -3034,10 +3034,11 @@ static void surface_load_sysmem(struct wined3d_surface *surface,
static
HRESULT
surface_load_drawable
(
struct
wined3d_surface
*
surface
,
struct
wined3d_context
*
context
)
{
struct
wined3d_texture
*
texture
=
surface
->
container
;
RECT
r
;
if
(
wined3d_settings
.
offscreen_rendering_mode
==
ORM_FBO
&&
wined3d_resource_is_offscreen
(
&
surface
->
container
->
resource
))
&&
wined3d_resource_is_offscreen
(
&
texture
->
resource
))
{
ERR
(
"Trying to load offscreen surface into WINED3D_LOCATION_DRAWABLE.
\n
"
);
return
WINED3DERR_INVALIDCALL
;
...
...
@@ -3045,7 +3046,7 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface,
surface_get_rect
(
surface
,
NULL
,
&
r
);
surface_load_location
(
surface
,
context
,
WINED3D_LOCATION_TEXTURE_RGB
);
surface_blt_to_drawable
(
surfac
e
->
resource
.
device
,
context
,
surface_blt_to_drawable
(
textur
e
->
resource
.
device
,
context
,
WINED3D_TEXF_POINT
,
FALSE
,
surface
,
&
r
,
surface
,
&
r
);
return
WINED3D_OK
;
...
...
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