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
c86467bd
Commit
c86467bd
authored
Feb 26, 2018
by
Henri Verbeet
Committed by
Alexandre Julliard
Feb 26, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Explicitly calculate the sub-resource level in arbfp_blit_set().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
b574fab0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+7
-5
No files found.
dlls/wined3d/arb_program_shader.c
View file @
c86467bd
...
...
@@ -7567,9 +7567,9 @@ static GLuint arbfp_gen_plain_shader(const struct wined3d_gl_info *gl_info, cons
/* Context activation is done by the caller. */
static
HRESULT
arbfp_blit_set
(
struct
wined3d_arbfp_blitter
*
blitter
,
struct
wined3d_context
*
context
,
const
struct
wined3d_surface
*
surface
,
const
struct
wined3d_color_key
*
color_key
)
const
struct
wined3d_texture
*
texture
,
unsigned
int
sub_resource_idx
,
const
struct
wined3d_color_key
*
color_key
)
{
const
struct
wined3d_texture
*
texture
=
surface
->
container
;
enum
complex_fixup
fixup
;
const
struct
wined3d_gl_info
*
gl_info
=
context
->
gl_info
;
struct
wine_rb_entry
*
entry
;
...
...
@@ -7577,10 +7577,12 @@ static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wine
struct
arbfp_blit_desc
*
desc
;
struct
wined3d_color
float_color_key
[
2
];
struct
wined3d_vec4
size
;
unsigned
int
level
;
GLuint
shader
;
size
.
x
=
wined3d_texture_get_level_pow2_width
(
texture
,
surface
->
texture_level
);
size
.
y
=
wined3d_texture_get_level_pow2_height
(
texture
,
surface
->
texture_level
);
level
=
sub_resource_idx
%
texture
->
level_count
;
size
.
x
=
wined3d_texture_get_level_pow2_width
(
texture
,
level
);
size
.
y
=
wined3d_texture_get_level_pow2_height
(
texture
,
level
);
size
.
z
=
1
.
0
f
;
size
.
w
=
1
.
0
f
;
...
...
@@ -7875,7 +7877,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl
color_key
=
&
alpha_test_key
;
}
arbfp_blit_set
(
arbfp_blitter
,
context
,
src_
surface
,
color_key
);
arbfp_blit_set
(
arbfp_blitter
,
context
,
src_
texture
,
src_sub_resource_idx
,
color_key
);
/* Draw a textured quad */
draw_textured_quad
(
src_texture
,
src_sub_resource_idx
,
context
,
src_rect
,
dst_rect
,
filter
);
...
...
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