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
f33c79d3
Commit
f33c79d3
authored
Apr 25, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 26, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass a wined3d_vec4 structure to shader_glsl_load_constants_f().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d7596b08
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
glsl_shader.c
dlls/wined3d/glsl_shader.c
+7
-9
No files found.
dlls/wined3d/glsl_shader.c
View file @
f33c79d3
...
...
@@ -700,20 +700,18 @@ static inline void walk_constant_heap_clamped(const struct wined3d_gl_info *gl_i
}
/* Context activation is done by the caller. */
static
void
shader_glsl_load_constants
F
(
const
struct
wined3d_shader
*
shader
,
const
struct
wined3d_gl_info
*
gl_info
,
const
float
*
constants
,
const
GLint
*
constant_locations
,
const
struct
constant_heap
*
heap
,
unsigned
char
*
stack
,
UINT
version
)
static
void
shader_glsl_load_constants
_f
(
const
struct
wined3d_shader
*
shader
,
const
struct
wined3d_gl_info
*
gl_info
,
const
struct
wined3d_vec4
*
constants
,
const
GLint
*
constant_locations
,
const
struct
constant_heap
*
heap
,
unsigned
char
*
stack
,
unsigned
int
version
)
{
const
struct
wined3d_shader_lconst
*
lconst
;
/* 1.X pshaders have the constants clamped to [-1;1] implicitly. */
if
(
shader
->
reg_maps
.
shader_version
.
major
==
1
&&
shader
->
reg_maps
.
shader_version
.
type
==
WINED3D_SHADER_TYPE_PIXEL
)
walk_constant_heap_clamped
(
gl_info
,
(
const
struct
wined3d_vec4
*
)
constants
,
constant_locations
,
heap
,
stack
,
version
);
walk_constant_heap_clamped
(
gl_info
,
constants
,
constant_locations
,
heap
,
stack
,
version
);
else
walk_constant_heap
(
gl_info
,
(
const
struct
wined3d_vec4
*
)
constants
,
constant_locations
,
heap
,
stack
,
version
);
walk_constant_heap
(
gl_info
,
constants
,
constant_locations
,
heap
,
stack
,
version
);
if
(
!
shader
->
load_local_constsF
)
{
...
...
@@ -1333,7 +1331,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
update_mask
=
context
->
constant_update_mask
&
prog
->
constant_update_mask
;
if
(
update_mask
&
WINED3D_SHADER_CONST_VS_F
)
shader_glsl_load_constants
F
(
vshader
,
gl_info
,
state
->
vs_consts_f
,
shader_glsl_load_constants
_f
(
vshader
,
gl_info
,
(
const
struct
wined3d_vec4
*
)
state
->
vs_consts_f
,
prog
->
vs
.
uniform_f_locations
,
&
priv
->
vconst_heap
,
priv
->
stack
,
constant_version
);
if
(
update_mask
&
WINED3D_SHADER_CONST_VS_I
)
...
...
@@ -1406,7 +1404,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
}
if
(
update_mask
&
WINED3D_SHADER_CONST_PS_F
)
shader_glsl_load_constants
F
(
pshader
,
gl_info
,
state
->
ps_consts_f
,
shader_glsl_load_constants
_f
(
pshader
,
gl_info
,
(
const
struct
wined3d_vec4
*
)
state
->
ps_consts_f
,
prog
->
ps
.
uniform_f_locations
,
&
priv
->
pconst_heap
,
priv
->
stack
,
constant_version
);
if
(
update_mask
&
WINED3D_SHADER_CONST_PS_I
)
...
...
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