KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl: encode vector_elements and matrix_columns better 

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Marek Olšák 2019-10-30 20:18:05 -04:00
parent 21d2fbb8c3
commit 86adce4fef
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/glsl_types.cpp
View File

@ -2578,9 +2578,9 @@ union packed_type {
struct {
unsigned base_type:5;
unsigned interface_row_major:1;
unsigned vector_elements:6;
unsigned matrix_columns:4;
unsigned _pad:16;
unsigned vector_elements:3;
unsigned matrix_columns:3;
unsigned _pad:20;
} basic;
struct {
unsigned base_type:5;
@ -2619,6 +2619,8 @@ encode_type_to_blob(struct blob *blob, const glsl_type *type)
case GLSL_TYPE_INT64:
case GLSL_TYPE_BOOL:
encoded.basic.interface_row_major = type->interface_row_major;
assert(type->vector_elements < 8);
assert(type->matrix_columns < 8);
encoded.basic.vector_elements = type->vector_elements;
encoded.basic.matrix_columns = type->matrix_columns;
blob_write_uint32(blob, encoded.u32);