fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-15 05:10:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glsl: Fix MSVC build.

Browse source 
It appears that `sizeof(Class::member)` is either non-standard or
merely unsupported in MSVC.

So use `sizeof(instance->member)` instead, which is guaranteed to work
everywhere.

Also promote the assert to a static assert.

Trivial.
This commit is contained in:
José Fonseca 2013-05-28 13:56:18 +01:00
parent d4a06d77f5
commit 4eaa0999b5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/glsl/link_uniforms.cpp
View file

@ -653,7 +653,7 @@ link_assign_uniform_locations(struct gl_shader_program *prog)
* types cannot have initializers."
*/
memset(prog->_LinkedShaders[i]->SamplerUnits, 0,
sizeof(gl_shader::SamplerUnits));
sizeof(prog->_LinkedShaders[i]->SamplerUnits));
link_update_uniform_buffer_variables(prog->_LinkedShaders[i]);
@ -724,9 +724,9 @@ link_assign_uniform_locations(struct gl_shader_program *prog)
prog->_LinkedShaders[i]->active_samplers = parcel.shader_samplers_used;
prog->_LinkedShaders[i]->shadow_samplers = parcel.shader_shadow_samplers;
assert(sizeof(gl_shader::SamplerTargets) == sizeof(parcel.targets));
STATIC_ASSERT(sizeof(prog->_LinkedShaders[i]->SamplerTargets) == sizeof(parcel.targets));
memcpy(prog->_LinkedShaders[i]->SamplerTargets, parcel.targets,
sizeof(gl_shader::SamplerTargets));
sizeof(prog->_LinkedShaders[i]->SamplerTargets));
}
#ifndef NDEBUG