From cd78ab55d0afefa501929366205443e15ed85495 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 21 Apr 2017 10:28:58 +0200 Subject: [PATCH] glsl: make use of glsl_type::is_interface() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Samuel Pitoiset Reviewed-by: Samuel Iglesias Gonsálvez Reviewed-by: Edward O'Callaghan --- src/compiler/glsl/hir_field_selection.cpp | 2 +- src/compiler/glsl/shader_cache.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/glsl/hir_field_selection.cpp b/src/compiler/glsl/hir_field_selection.cpp index eab08ad..aa1808a 100644 --- a/src/compiler/glsl/hir_field_selection.cpp +++ b/src/compiler/glsl/hir_field_selection.cpp @@ -47,7 +47,7 @@ _mesa_ast_field_selection_to_hir(const ast_expression *expr, if (op->type->is_error()) { /* silently propagate the error */ } else if (op->type->base_type == GLSL_TYPE_STRUCT - || op->type->base_type == GLSL_TYPE_INTERFACE) { + || op->type->is_interface()) { result = new(ctx) ir_dereference_record(op, expr->primary_expression.identifier); diff --git a/src/compiler/glsl/shader_cache.cpp b/src/compiler/glsl/shader_cache.cpp index 19d69c3..800d3a2 100644 --- a/src/compiler/glsl/shader_cache.cpp +++ b/src/compiler/glsl/shader_cache.cpp @@ -129,7 +129,7 @@ encode_type_to_blob(struct blob *blob, const glsl_type *type) blob_write_string(blob, type->fields.structure[i].name); } - if (type->base_type == GLSL_TYPE_INTERFACE) { + if (type->is_interface()) { blob_write_uint32(blob, type->interface_packing); blob_write_uint32(blob, type->interface_row_major); } -- 2.7.4