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
d7169914
Commit
d7169914
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_texture().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
fad52d78
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
surface.c
dlls/wined3d/surface.c
+8
-8
No files found.
dlls/wined3d/surface.c
View file @
d7169914
...
...
@@ -3058,9 +3058,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
unsigned
int
width
,
src_row_pitch
,
src_slice_pitch
,
dst_row_pitch
,
dst_slice_pitch
;
const
RECT
src_rect
=
{
0
,
0
,
surface
->
resource
.
width
,
surface
->
resource
.
height
};
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
struct
wined3d_device
*
device
=
surface
->
resource
.
device
;
const
struct
wined3d_color_key_conversion
*
conversion
;
struct
wined3d_texture
*
texture
=
surface
->
container
;
struct
wined3d_device
*
device
=
texture
->
resource
.
device
;
const
struct
wined3d_color_key_conversion
*
conversion
;
struct
wined3d_bo_address
data
;
struct
wined3d_format
format
;
POINT
dst_point
=
{
0
,
0
};
...
...
@@ -3076,10 +3076,10 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
}
if
(
surface
->
locations
&
(
WINED3D_LOCATION_TEXTURE_SRGB
|
WINED3D_LOCATION_TEXTURE_RGB
)
&&
(
surface
->
container
->
resource
.
format_flags
&
WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB
)
&&
(
texture
->
resource
.
format_flags
&
WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB
)
&&
fbo_blit_supported
(
gl_info
,
WINED3D_BLIT_OP_COLOR_BLIT
,
NULL
,
surface
->
resource
.
usage
,
surface
->
resource
.
pool
,
surfac
e
->
resource
.
format
,
NULL
,
surface
->
resource
.
usage
,
surface
->
resource
.
pool
,
surfac
e
->
resource
.
format
))
NULL
,
texture
->
resource
.
usage
,
texture
->
resource
.
pool
,
textur
e
->
resource
.
format
,
NULL
,
texture
->
resource
.
usage
,
texture
->
resource
.
pool
,
textur
e
->
resource
.
format
))
{
if
(
srgb
)
surface_blt_fbo
(
device
,
context
,
WINED3D_TEXF_POINT
,
surface
,
WINED3D_LOCATION_TEXTURE_RGB
,
...
...
@@ -3092,10 +3092,10 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface,
}
if
(
surface
->
locations
&
(
WINED3D_LOCATION_RB_MULTISAMPLE
|
WINED3D_LOCATION_RB_RESOLVED
)
&&
(
!
srgb
||
(
surface
->
container
->
resource
.
format_flags
&
WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB
))
&&
(
!
srgb
||
(
texture
->
resource
.
format_flags
&
WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB
))
&&
fbo_blit_supported
(
gl_info
,
WINED3D_BLIT_OP_COLOR_BLIT
,
NULL
,
surface
->
resource
.
usage
,
surface
->
resource
.
pool
,
surfac
e
->
resource
.
format
,
NULL
,
surface
->
resource
.
usage
,
surface
->
resource
.
pool
,
surfac
e
->
resource
.
format
))
NULL
,
texture
->
resource
.
usage
,
texture
->
resource
.
pool
,
textur
e
->
resource
.
format
,
NULL
,
texture
->
resource
.
usage
,
texture
->
resource
.
pool
,
textur
e
->
resource
.
format
))
{
DWORD
src_location
=
surface
->
locations
&
WINED3D_LOCATION_RB_RESOLVED
?
WINED3D_LOCATION_RB_RESOLVED
:
WINED3D_LOCATION_RB_MULTISAMPLE
;
...
...
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