summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/shaderobj.h
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2010-11-23 10:28:43 -0700
committerBrian Paul <[email protected]>2010-11-23 15:52:43 -0700
commitc628fd743ee3c3305e9beac7f0e6efacf6982115 (patch)
tree873ae98daf0b76c1778e0c10da0226ca91bff089 /src/mesa/main/shaderobj.h
parent512f840702d58b48607a9dca06dd939256c7afed (diff)
mesa: replace #defines with new gl_shader_type enum
Diffstat (limited to 'src/mesa/main/shaderobj.h')
-rw-r--r--src/mesa/main/shaderobj.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/shaderobj.h b/src/mesa/main/shaderobj.h
index 346a5b75175..de7c998cf0e 100644
--- a/src/mesa/main/shaderobj.h
+++ b/src/mesa/main/shaderobj.h
@@ -98,7 +98,7 @@ extern void
_mesa_free_shader_state(struct gl_context *ctx);
-static INLINE GLuint
+static INLINE gl_shader_type
_mesa_shader_type_to_index(GLenum v)
{
switch (v) {
@@ -110,7 +110,7 @@ _mesa_shader_type_to_index(GLenum v)
return MESA_SHADER_GEOMETRY;
default:
ASSERT(0 && "bad value in _mesa_shader_type_to_index()");
- return ~0;
+ return MESA_SHADER_TYPES;
}
}