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
62a766f7
Commit
62a766f7
authored
Apr 19, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 20, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use the texture dimensions in swapchain_blit().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
70f1d0ef
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
11 deletions
+5
-11
surface.c
dlls/wined3d/surface.c
+0
-2
swapchain.c
dlls/wined3d/swapchain.c
+5
-5
texture.c
dlls/wined3d/texture.c
+0
-2
wined3d_private.h
dlls/wined3d/wined3d_private.h
+0
-2
No files found.
dlls/wined3d/surface.c
View file @
62a766f7
...
...
@@ -4351,8 +4351,6 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex
surface
->
resource
.
access_flags
=
container
->
resource
.
access_flags
;
surface
->
container
=
container
;
surface
->
pow2Width
=
wined3d_texture_get_level_pow2_width
(
container
,
level
);
surface
->
pow2Height
=
wined3d_texture_get_level_pow2_height
(
container
,
level
);
surface
->
texture_target
=
target
;
surface
->
texture_level
=
level
;
surface
->
texture_layer
=
layer
;
...
...
dlls/wined3d/swapchain.c
View file @
62a766f7
...
...
@@ -361,12 +361,12 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain,
context2
=
context_acquire
(
device
,
back_buffer
);
context_apply_blit_state
(
context2
,
device
);
if
(
back_buffer
->
container
->
flags
&
WINED3D_TEXTURE_NORMALIZED_COORDS
)
if
(
texture
->
flags
&
WINED3D_TEXTURE_NORMALIZED_COORDS
)
{
tex_left
/=
back_buffer
->
pow2W
idth
;
tex_right
/=
back_buffer
->
pow2W
idth
;
tex_top
/=
back_buffer
->
pow2H
eight
;
tex_bottom
/=
back_buffer
->
pow2H
eight
;
tex_left
/=
texture
->
pow2_w
idth
;
tex_right
/=
texture
->
pow2_w
idth
;
tex_top
/=
texture
->
pow2_h
eight
;
tex_bottom
/=
texture
->
pow2_h
eight
;
}
if
(
is_complex_fixup
(
texture
->
resource
.
format
->
color_fixup
))
...
...
dlls/wined3d/texture.c
View file @
62a766f7
...
...
@@ -987,8 +987,6 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT
texture
->
pow2_width
=
width
;
texture
->
pow2_height
=
height
;
}
surface
->
pow2Width
=
texture
->
pow2_width
;
surface
->
pow2Height
=
texture
->
pow2_height
;
sub_resource
->
locations
=
0
;
...
...
dlls/wined3d/wined3d_private.h
View file @
62a766f7
...
...
@@ -2651,8 +2651,6 @@ struct wined3d_surface
struct
wined3d_resource
resource
;
struct
wined3d_texture
*
container
;
UINT
pow2Width
;
UINT
pow2Height
;
GLenum
texture_target
;
unsigned
int
texture_level
;
unsigned
int
texture_layer
;
...
...
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