fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 09:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: define gl_LightSource members in ARB_vertex_program order

Browse source 
GLSL shares functionality with ARB_vertex_program but the GLSL
spec defines the gl_LightSource builtin with a member order that
is different from the packing expected in ARB_vertex_program.
This difference introduces a need for specialist lowering code
when handling builtin structs that is not required for normal
uniform structs due to member location mismatches.

Since gl_LightSource can't be redefined it shouldn't matter if
we add the members in the order listed in the spec, just so long
as we add them all. So here we rearrange the definition of the
glsl builtin to reflex our internal layout and that of
ARB_vertex_program. This required for the following patch.

CC: <stable@lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5656>
This commit is contained in:
Timothy Arceri 2020-06-26 18:54:56 +10:00 • committed by Marge Bot
parent 5ddab654d9
commit 4cca5137ae
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/compiler/glsl/builtin_types.cpp
View file

@ -83,12 +83,12 @@ static const struct glsl_struct_field gl_LightSourceParameters_fields[] = {
glsl_struct_field(glsl_type::vec4_type, "position"),
glsl_struct_field(glsl_type::vec4_type, "halfVector"),
glsl_struct_field(glsl_type::vec3_type, "spotDirection"),
glsl_struct_field(glsl_type::float_type, "spotExponent"),
glsl_struct_field(glsl_type::float_type, "spotCutoff"),
glsl_struct_field(glsl_type::float_type, "spotCosCutoff"),
glsl_struct_field(glsl_type::float_type, "constantAttenuation"),
glsl_struct_field(glsl_type::float_type, "linearAttenuation"),
glsl_struct_field(glsl_type::float_type, "quadraticAttenuation"),
glsl_struct_field(glsl_type::float_type, "spotExponent"),
glsl_struct_field(glsl_type::float_type, "spotCutoff"),
};
static const struct glsl_struct_field gl_LightModelParameters_fields[] = {

4
src/compiler/glsl/builtin_variables.cpp
View file

@ -100,12 +100,12 @@ static const struct gl_builtin_uniform_element gl_LightSource_elements[] = {
SWIZZLE_Y,
SWIZZLE_Z,
SWIZZLE_Z)},
{"spotExponent", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_WWWW},
{"spotCutoff", {STATE_LIGHT, 0, STATE_SPOT_CUTOFF}, SWIZZLE_XXXX},
{"spotCosCutoff", {STATE_LIGHT, 0, STATE_SPOT_DIRECTION}, SWIZZLE_WWWW},
{"constantAttenuation", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_XXXX},
{"linearAttenuation", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_YYYY},
{"quadraticAttenuation", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_ZZZZ},
{"spotExponent", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_WWWW},
{"spotCutoff", {STATE_LIGHT, 0, STATE_SPOT_CUTOFF}, SWIZZLE_XXXX},
};
static const struct gl_builtin_uniform_element gl_LightModel_elements[] = {