diff options
author | Dave Airlie <[email protected]> | 2016-05-11 10:49:19 +1000 |
---|---|---|
committer | Dave Airlie <[email protected]> | 2016-06-06 15:58:37 +1000 |
commit | 78659ade404a0761968ab5240c812e4c3119d669 (patch) | |
tree | 1c290cc2d1460ace7d44c602cf2891561d4e410e /src/compiler/glsl/linker.h | |
parent | ff2e569153d48bda347be729fc441852ab293138 (diff) |
glsl: use enum glsl_interface_packing in more places. (v2)
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 <[email protected]>
Reviewed-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'src/compiler/glsl/linker.h')
-rw-r--r-- | src/compiler/glsl/linker.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/glsl/linker.h b/src/compiler/glsl/linker.h index 3a0ec8b35d3..045dc1fff02 100644 --- a/src/compiler/glsl/linker.h +++ b/src/compiler/glsl/linker.h @@ -156,7 +156,7 @@ protected: */ virtual void visit_field(const glsl_type *type, const char *name, bool row_major, const glsl_type *record_type, - const unsigned packing, + const enum glsl_interface_packing packing, bool last_field); /** @@ -180,10 +180,10 @@ protected: virtual void visit_field(const glsl_struct_field *field); virtual void enter_record(const glsl_type *type, const char *name, - bool row_major, const unsigned packing); + bool row_major, const enum glsl_interface_packing packing); virtual void leave_record(const glsl_type *type, const char *name, - bool row_major, const unsigned packing); + bool row_major, const enum glsl_interface_packing packing); virtual void set_buffer_offset(unsigned offset); @@ -199,7 +199,7 @@ private: */ void recursion(const glsl_type *t, char **name, size_t name_length, bool row_major, const glsl_type *record_type, - const unsigned packing, + const enum glsl_interface_packing packing, bool last_field, unsigned record_array_count, const glsl_struct_field *named_ifc_member); }; |