summaryrefslogtreecommitdiffstats
path: root/src/compiler/glsl
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-04-21 10:28:58 +0200
committerSamuel Pitoiset <[email protected]>2017-04-21 19:33:34 +0200
commitcd78ab55d0afefa501929366205443e15ed85495 (patch)
tree3be2d82e0d650525d1a6685bd46a821e8199c6e7 /src/compiler/glsl
parent0c8898dc34b1b8efc12e7491c303249bd081253d (diff)
glsl: make use of glsl_type::is_interface()
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]> Reviewed-by: Edward O'Callaghan <[email protected]>
Diffstat (limited to 'src/compiler/glsl')
-rw-r--r--src/compiler/glsl/hir_field_selection.cpp2
-rw-r--r--src/compiler/glsl/shader_cache.cpp2
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 eab08ad8235..aa1808afa15 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 19d69c36fc4..800d3a29133 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);
}