Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
c9d82ffa
Commit
c9d82ffa
authored
Apr 13, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 14, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use the texture dimension helpers in arbfp_blit_set().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
1e0603eb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
3 deletions
+8
-3
arb_program_shader.c
dlls/wined3d/arb_program_shader.c
+8
-3
No files found.
dlls/wined3d/arb_program_shader.c
View file @
c9d82ffa
...
...
@@ -7681,8 +7681,6 @@ static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv,
static
HRESULT
arbfp_blit_set
(
void
*
blit_priv
,
struct
wined3d_context
*
context
,
const
struct
wined3d_surface
*
surface
,
const
struct
wined3d_color_key
*
color_key
)
{
GLuint
shader
;
float
size
[
4
]
=
{(
float
)
surface
->
pow2Width
,
(
float
)
surface
->
pow2Height
,
1
.
0
f
,
1
.
0
f
};
const
struct
wined3d_texture
*
texture
=
surface
->
container
;
struct
arbfp_blit_priv
*
priv
=
blit_priv
;
enum
complex_fixup
fixup
;
...
...
@@ -7691,6 +7689,13 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context,
struct
arbfp_blit_type
type
;
struct
arbfp_blit_desc
*
desc
;
struct
wined3d_color
float_color_key
[
2
];
struct
wined3d_vec4
size
;
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
);
size
.
z
=
1
.
0
f
;
size
.
w
=
1
.
0
f
;
if
(
is_complex_fixup
(
texture
->
resource
.
format
->
color_fixup
))
fixup
=
get_complex_fixup
(
texture
->
resource
.
format
->
color_fixup
);
...
...
@@ -7787,7 +7792,7 @@ err_out:
checkGLcall
(
"glEnable(GL_FRAGMENT_PROGRAM_ARB)"
);
GL_EXTCALL
(
glBindProgramARB
(
GL_FRAGMENT_PROGRAM_ARB
,
shader
));
checkGLcall
(
"glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)"
);
GL_EXTCALL
(
glProgramLocalParameter4fvARB
(
GL_FRAGMENT_PROGRAM_ARB
,
ARBFP_BLIT_PARAM_SIZE
,
size
));
GL_EXTCALL
(
glProgramLocalParameter4fvARB
(
GL_FRAGMENT_PROGRAM_ARB
,
ARBFP_BLIT_PARAM_SIZE
,
&
size
.
x
));
checkGLcall
(
"glProgramLocalParameter4fvARB"
);
if
(
type
.
use_color_key
)
{
...
...
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