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

glsl: Make the align function available elsewhere in the linker

Browse source 
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Carl Worth <cworth@cworth.org>
This commit is contained in:
Ian Romanick 2013-01-22 00:06:10 -05:00
parent e2c95cd674
commit 11d42de681
4 changed files with 20 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/glsl/glsl_types.cpp
View file

@ -863,12 +863,6 @@ glsl_type::std140_base_alignment(bool row_major) const
return -1;
}
static unsigned
align(unsigned val, unsigned align)
{
return (val + align - 1) / align * align;
}
unsigned
glsl_type::std140_size(bool row_major) const
{
@ -970,11 +964,11 @@ glsl_type::std140_size(bool row_major) const
for (unsigned i = 0; i < this->length; i++) {
const struct glsl_type *field_type = this->fields.structure[i].type;
unsigned align = field_type->std140_base_alignment(row_major);
size = (size + align - 1) / align * align;
size = glsl_align(size, align);
size += field_type->std140_size(row_major);
}
size = align(size,
this->fields.structure[0].type->std140_base_alignment(row_major));
size = glsl_align(size,
this->fields.structure[0].type->std140_base_alignment(row_major));
return size;
}

6
src/glsl/glsl_types.h
View file

@ -601,6 +601,12 @@ struct glsl_struct_field {
bool row_major;
};
static inline unsigned int
glsl_align(unsigned int a, unsigned int align)
{
return (a + align - 1) / align * align;
}
#endif /* __cplusplus */
#endif /* GLSL_TYPES_H */

14
src/glsl/link_uniforms.cpp
View file

@ -29,12 +29,6 @@
#include "program/hash_table.h"
#include "program.h"
static inline unsigned int
align(unsigned int a, unsigned int align)
{
return (a + align - 1) / align * align;
}
/**
* \file link_uniforms.cpp
* Assign locations for GLSL uniforms.
@ -426,13 +420,13 @@ private:
this->uniforms[id].block_index = this->ubo_block_index;
unsigned alignment = type->std140_base_alignment(ubo_row_major);
this->ubo_byte_offset = align(this->ubo_byte_offset, alignment);
this->ubo_byte_offset = glsl_align(this->ubo_byte_offset, alignment);
this->uniforms[id].offset = this->ubo_byte_offset;
this->ubo_byte_offset += type->std140_size(ubo_row_major);
if (type->is_array()) {
this->uniforms[id].array_stride =
align(type->fields.array->std140_size(ubo_row_major), 16);
glsl_align(type->fields.array->std140_size(ubo_row_major), 16);
} else {
this->uniforms[id].array_stride = 0;
}
@ -570,7 +564,7 @@ link_assign_uniform_block_offsets(struct gl_shader *shader)
unsigned alignment = type->std140_base_alignment(ubo_var->RowMajor);
unsigned size = type->std140_size(ubo_var->RowMajor);
offset = align(offset, alignment);
offset = glsl_align(offset, alignment);
ubo_var->Offset = offset;
offset += size;
}
@ -586,7 +580,7 @@ link_assign_uniform_block_offsets(struct gl_shader *shader)
* and rounding up to the next multiple of the base
* alignment required for a vec4."
*/
block->UniformBufferSize = align(offset, 16);
block->UniformBufferSize = glsl_align(offset, 16);
}
}

19
src/glsl/lower_ubo_reference.cpp
View file

@ -61,12 +61,6 @@ public:
bool progress;
};
static inline unsigned int
align(unsigned int a, unsigned int align)
{
return (a + align - 1) / align * align;
}
void
lower_ubo_reference_visitor::handle_rvalue(ir_rvalue **rvalue)
{
@ -113,7 +107,7 @@ lower_ubo_reference_visitor::handle_rvalue(ir_rvalue **rvalue)
array_stride = 4;
} else {
array_stride = deref_array->type->std140_size(row_major);
array_stride = align(array_stride, 16);
array_stride = glsl_align(array_stride, 16);
}
ir_constant *const_index = deref_array->array_index->as_constant();
@ -138,7 +132,7 @@ lower_ubo_reference_visitor::handle_rvalue(ir_rvalue **rvalue)
const glsl_type *type = struct_type->fields.structure[i].type;
unsigned field_align = type->std140_base_alignment(row_major);
max_field_align = MAX2(field_align, max_field_align);
intra_struct_offset = align(intra_struct_offset, field_align);
intra_struct_offset = glsl_align(intra_struct_offset, field_align);
if (strcmp(struct_type->fields.structure[i].name,
deref_record->field) == 0)
@ -146,7 +140,7 @@ lower_ubo_reference_visitor::handle_rvalue(ir_rvalue **rvalue)
intra_struct_offset += type->std140_size(row_major);
}
const_offset = align(const_offset, max_field_align);
const_offset = glsl_align(const_offset, max_field_align);
const_offset += intra_struct_offset;
deref = deref_record->record->as_dereference();
@ -217,8 +211,8 @@ lower_ubo_reference_visitor::emit_ubo_loads(ir_dereference *deref,
field->name);
field_offset =
align(field_offset,
field->type->std140_base_alignment(ubo_var->RowMajor));
glsl_align(field_offset,
field->type->std140_base_alignment(ubo_var->RowMajor));
emit_ubo_loads(field_deref, base_offset, deref_offset + field_offset);
@ -229,7 +223,8 @@ lower_ubo_reference_visitor::emit_ubo_loads(ir_dereference *deref,
if (deref->type->is_array()) {
unsigned array_stride =
align(deref->type->fields.array->std140_size(ubo_var->RowMajor), 16);
glsl_align(deref->type->fields.array->std140_size(ubo_var->RowMajor),
16);
for (unsigned i = 0; i < deref->type->length; i++) {
ir_constant *element = new(mem_ctx) ir_constant(i);