OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: use enum glsl_interface_packing in more places. (v2)

Browse Source 
Although the glsl_types.h stores this in a bitfield,
we should hide that from everyone else. Hide the cast
in an accessor method and use the enum everywhere.

This makes things a bit nicer in gdb, and improves type
safety.

v2: fix a few pieces of interface I missed that caused some
piglit regressions.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Dave Airlie
2016-05-11 10:49:19 +10:00
parent ff2e569153
commit 78659ade40
11 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/glsl/link_uniform_blocks.cpp
View File

@@ -70,7 +70,7 @@ private:
}
virtual void enter_record(const glsl_type *type, const char *,
bool row_major, const unsigned packing) {
bool row_major, const enum glsl_interface_packing packing) {
assert(type->is_record());
if (packing == GLSL_INTERFACE_PACKING_STD430)
this->offset = glsl_align(
@@ -81,7 +81,7 @@ private:
}
virtual void leave_record(const glsl_type *type, const char *,
bool row_major, const unsigned packing) {
bool row_major, const enum glsl_interface_packing packing) {
assert(type->is_record());
/* If this is the last field of a structure, apply rule #9. The
@@ -106,7 +106,7 @@ private:
virtual void visit_field(const glsl_type *type, const char *name,
bool row_major, const glsl_type *,
const unsigned packing,
const enum glsl_interface_packing packing,
bool last_field)
{
assert(this->index < this->num_variables);