1 files changed, 2 insertions, 14 deletions
diff --git a/src/mesa/main/shaderobj.h b/src/mesa/main/shaderobj.h
index 5c6a056bcc9..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;
    }
 }
 
@@ -130,18 +130,6 @@ _mesa_shader_index_to_type(GLuint i)
 }
 
 
-/**
- * Check if there's a fragment shader active.
- */
-static INLINE GLboolean
-_mesa_is_fragment_shader_active(const struct gl_context *ctx)
-{
-   return (ctx->Shader.CurrentProgram &&
-           ctx->Shader.CurrentProgram->LinkStatus &&
-           ctx->Shader.CurrentProgram->FragmentProgram);
-}
-
-
 #ifdef __cplusplus
 }
 #endif