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
d7596b08
Commit
d7596b08
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 walk_constant_heap().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
cf3d5a20
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
glsl_shader.c
dlls/wined3d/glsl_shader.c
+4
-3
No files found.
dlls/wined3d/glsl_shader.c
View file @
d7596b08
...
...
@@ -551,7 +551,7 @@ static void shader_glsl_load_samplers(const struct wined3d_gl_info *gl_info,
}
/* Context activation is done by the caller. */
static
inline
void
walk_constant_heap
(
const
struct
wined3d_gl_info
*
gl_info
,
const
float
*
constants
,
static
inline
void
walk_constant_heap
(
const
struct
wined3d_gl_info
*
gl_info
,
const
struct
wined3d_vec4
*
constants
,
const
GLint
*
constant_locations
,
const
struct
constant_heap
*
heap
,
unsigned
char
*
stack
,
DWORD
version
)
{
unsigned
int
start
=
~
0U
,
end
=
0
;
...
...
@@ -620,7 +620,7 @@ static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, con
}
}
if
(
start
<=
end
)
GL_EXTCALL
(
glUniform4fv
(
constant_locations
[
start
],
end
-
start
+
1
,
&
constants
[
start
*
4
]
));
GL_EXTCALL
(
glUniform4fv
(
constant_locations
[
start
],
end
-
start
+
1
,
&
constants
[
start
].
x
));
checkGLcall
(
"walk_constant_heap()"
);
}
...
...
@@ -712,7 +712,8 @@ static void shader_glsl_load_constantsF(const struct wined3d_shader *shader, con
walk_constant_heap_clamped
(
gl_info
,
(
const
struct
wined3d_vec4
*
)
constants
,
constant_locations
,
heap
,
stack
,
version
);
else
walk_constant_heap
(
gl_info
,
constants
,
constant_locations
,
heap
,
stack
,
version
);
walk_constant_heap
(
gl_info
,
(
const
struct
wined3d_vec4
*
)
constants
,
constant_locations
,
heap
,
stack
,
version
);
if
(
!
shader
->
load_local_constsF
)
{
...
...
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