summaryrefslogtreecommitdiffstats
path: root/src/compiler
diff options
context:
space:
mode:
authorNicolai Hähnle <[email protected]>2017-07-04 10:22:02 +0200
committerNicolai Hähnle <[email protected]>2017-07-31 14:55:30 +0200
commitc5f97eab094c43cedcb2218599a1f0aa51b16238 (patch)
treea3ccfb1b3f7d28f12961f0c051476d7e1121659e /src/compiler
parent2cf8c8461931c5b23cac4d9cf834f120150ff869 (diff)
st/mesa: get rid of st_glsl_types
It's a duplicate of glsl_type::count_attribute_slots. Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/glsl_types.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp
index 188b72f345a..99cc696c19b 100644
--- a/src/compiler/glsl_types.cpp
+++ b/src/compiler/glsl_types.cpp
@@ -1999,10 +1999,12 @@ glsl_type::count_attribute_slots(bool is_vertex_input) const
case GLSL_TYPE_ARRAY:
return this->length * this->fields.array->count_attribute_slots(is_vertex_input);
+ case GLSL_TYPE_SUBROUTINE:
+ return 1;
+
case GLSL_TYPE_FUNCTION:
case GLSL_TYPE_ATOMIC_UINT:
case GLSL_TYPE_VOID:
- case GLSL_TYPE_SUBROUTINE:
case GLSL_TYPE_ERROR:
break;
}