mesa: Change "BRIAN PAUL" to "THE AUTHORS" in license text.

[mesa.git] / src / mesa / main / shaderobj.h

diff --git a/src/mesa/main/shaderobj.h b/src/mesa/main/shaderobj.h
index 5c6a056bcc908a84587af9c3401cda7434f461be..a256655917b0d209ef6b99c055378d5941d9650b 100644 (file)
--- a/src/mesa/main/shaderobj.h
+++ b/src/mesa/main/shaderobj.h
@@ -17,7 +17,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
@@ -32,9 +32,12 @@
 #include "main/mtypes.h"
 #include "program/ir_to_mesa.h"
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+
 /**
  * Internal functions
  */
@@ -98,7 +101,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,12 +113,12 @@ _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;
    }
 }
 
 
-static INLINE GLenum
+static inline GLenum
 _mesa_shader_index_to_type(GLuint i)
 {
    static const GLenum enums[MESA_SHADER_TYPES] = {
@@ -130,18 +133,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