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

glsl: make minimum struct size = 2, not 1

Browse source 
1-component structs such as "struct foo { float x; }" could get placed at
any position within a register.  This caused some trouble computing the
field offset which assumed all struct objects were placed at R.x.
It would be unusual to hit this case in normal shaders.

(cherry picked from master, commit ca03e881a8)
This commit is contained in:
Brian Paul 2009-01-09 09:59:49 -07:00
parent 630b6e896b
commit a719d70474
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/mesa/shader/slang/slang_codegen.c
View file

@ -213,7 +213,14 @@ _slang_sizeof_type_specifier(const slang_type_specifier *spec)
break;
case SLANG_SPEC_STRUCT:
sz = _slang_field_offset(spec, 0); /* special use */
if (sz > 4) {
if (sz == 1) {
/* 1-float structs are actually troublesome to deal with since they
* might get placed at R.x, R.y, R.z or R.z. Return size=2 to
* ensure the object is placed at R.x
*/
sz = 2;
}
else if (sz > 4) {
sz = (sz + 3) & ~0x3; /* round up to multiple of four */
}
break;