mesa: create copyteximage_err() helper and always inline copyteximage()

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

diff --git a/src/mesa/main/shaderobj.h b/src/mesa/main/shaderobj.h
index 943044e37cdd7984284c09281e5a0ec0a8835ccb..97b8ce7ac233f55c22561374ce4679cfbfd943f6 100644 (file)
--- a/src/mesa/main/shaderobj.h
+++ b/src/mesa/main/shaderobj.h
@@ -66,6 +66,11 @@ _mesa_reference_shader_program_(struct gl_context *ctx,
                                struct gl_shader_program **ptr,
                                struct gl_shader_program *shProg);
 
+void
+_mesa_reference_shader_program_data(struct gl_context *ctx,
+                                    struct gl_shader_program_data **ptr,
+                                    struct gl_shader_program_data *data);
+
 static inline void
 _mesa_reference_shader_program(struct gl_context *ctx,
                                struct gl_shader_program **ptr,
@@ -75,12 +80,15 @@ _mesa_reference_shader_program(struct gl_context *ctx,
       _mesa_reference_shader_program_(ctx, ptr, shProg);
 }
 
+extern struct gl_shader *
+_mesa_new_shader(GLuint name, gl_shader_stage type);
 
 extern void
-_mesa_init_shader(struct gl_context *ctx, struct gl_shader *shader);
+_mesa_delete_shader(struct gl_context *ctx, struct gl_shader *sh);
 
-extern struct gl_shader *
-_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type);
+extern void
+_mesa_delete_linked_shader(struct gl_context *ctx,
+                           struct gl_linked_shader *sh);
 
 extern struct gl_shader_program *
 _mesa_lookup_shader_program(struct gl_context *ctx, GLuint name);
@@ -89,13 +97,20 @@ extern struct gl_shader_program *
 _mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,
                                 const char *caller);
 
+extern struct gl_shader_program *
+_mesa_new_shader_program(GLuint name);
+
 extern void
-_mesa_clear_shader_program_data(struct gl_shader_program *shProg);
+_mesa_clear_shader_program_data(struct gl_context *ctx,
+                                struct gl_shader_program *shProg);
 
 extern void
 _mesa_free_shader_program_data(struct gl_context *ctx,
                                struct gl_shader_program *shProg);
 
+extern void
+_mesa_delete_shader_program(struct gl_context *ctx,
+                            struct gl_shader_program *shProg);
 
 
 extern void
@@ -118,8 +133,7 @@ _mesa_shader_enum_to_shader_stage(GLenum v)
    case GL_COMPUTE_SHADER:
       return MESA_SHADER_COMPUTE;
    default:
-      assert(0 && "bad value in _mesa_shader_enum_to_shader_stage()");
-      return MESA_SHADER_VERTEX;
+      unreachable("bad value in _mesa_shader_enum_to_shader_stage()");
    }
 }
 
@@ -150,7 +164,6 @@ static inline gl_shader_stage
 _mesa_shader_stage_from_subroutine_uniform(GLenum subuniform)
 {
    switch (subuniform) {
-   default:
    case GL_VERTEX_SUBROUTINE_UNIFORM:
       return MESA_SHADER_VERTEX;
    case GL_GEOMETRY_SUBROUTINE_UNIFORM:
@@ -164,6 +177,7 @@ _mesa_shader_stage_from_subroutine_uniform(GLenum subuniform)
    case GL_TESS_EVALUATION_SUBROUTINE_UNIFORM:
       return MESA_SHADER_TESS_EVAL;
    }
+   unreachable("not reached");
 }
 
 static inline gl_shader_stage
@@ -183,13 +197,13 @@ _mesa_shader_stage_from_subroutine(GLenum subroutine)
    case GL_TESS_EVALUATION_SUBROUTINE:
       return MESA_SHADER_TESS_EVAL;
    }
+   unreachable("not reached");
 }
 
 static inline GLenum
 _mesa_shader_stage_to_subroutine(gl_shader_stage stage)
 {
    switch (stage) {
-   default:
    case MESA_SHADER_VERTEX:
       return GL_VERTEX_SUBROUTINE;
    case MESA_SHADER_GEOMETRY:
@@ -202,14 +216,16 @@ _mesa_shader_stage_to_subroutine(gl_shader_stage stage)
       return GL_TESS_CONTROL_SUBROUTINE;
    case MESA_SHADER_TESS_EVAL:
       return GL_TESS_EVALUATION_SUBROUTINE;
+   case MESA_SHADER_NONE:
+      break;
    }
+   unreachable("not reached");
 }
 
 static inline GLenum
 _mesa_shader_stage_to_subroutine_uniform(gl_shader_stage stage)
 {
    switch (stage) {
-   default:
    case MESA_SHADER_VERTEX:
       return GL_VERTEX_SUBROUTINE_UNIFORM;
    case MESA_SHADER_GEOMETRY:
@@ -222,9 +238,15 @@ _mesa_shader_stage_to_subroutine_uniform(gl_shader_stage stage)
       return GL_TESS_CONTROL_SUBROUTINE_UNIFORM;
    case MESA_SHADER_TESS_EVAL:
       return GL_TESS_EVALUATION_SUBROUTINE_UNIFORM;
+   case MESA_SHADER_NONE:
+      break;
    }
+   unreachable("not reached");
 }
 
+extern bool
+_mesa_validate_pipeline_io(struct gl_pipeline_object *);
+
 #ifdef __cplusplus
 }
 #endif