ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Henri Verbeet 2016-04-25 17:19:31 +02:00 committed by Alexandre Julliard
parent cf3d5a2046
commit d7596b08ea
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/wined3d/glsl_shader.c
View File

@ -551,7 +551,7 @@ static void shader_glsl_load_samplers(const struct wined3d_gl_info *gl_info,
} }
/* Context activation is done by the caller. */ /* 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) const GLint *constant_locations, const struct constant_heap *heap, unsigned char *stack, DWORD version)
{ {
unsigned int start = ~0U, end = 0; 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) 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()"); 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, walk_constant_heap_clamped(gl_info, (const struct wined3d_vec4 *)constants,
constant_locations, heap, stack, version); constant_locations, heap, stack, version);
else 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) if (!shader->load_local_constsF)
{ {