mesa: Remove the CompileShader driver hook; it's just a no-op.

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 95b56895793fc06028717d75c0a362fd6e8f1db5..8b3f5adb9f9548ea85773322794e268ced0344fd 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -77,15 +77,6 @@ brw_new_shader_program(struct gl_context *ctx, GLuint name)
    return &prog->base;
 }
 
-GLboolean
-brw_compile_shader(struct gl_context *ctx, struct gl_shader *shader)
-{
-   if (!_mesa_ir_compile_shader(ctx, shader))
-      return GL_FALSE;
-
-   return GL_TRUE;
-}
-
 GLboolean
 brw_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)
 {

diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c
index 7d653327e301f63a5efd6d6ac4a97ca608d00c3e..ee68095fcebb5e7a7bed7f6b3fa3dab4206e7b2d 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -243,7 +243,6 @@ void brwInitFragProgFuncs( struct dd_function_table *functions )
 
    functions->NewShader = brw_new_shader;
    functions->NewShaderProgram = brw_new_shader_program;
-   functions->CompileShader = brw_compile_shader;
    functions->LinkShader = brw_link_shader;
 }
 

diff --git a/src/mesa/drivers/dri/i965/brw_wm.h b/src/mesa/drivers/dri/i965/brw_wm.h
index 90771e1f503e73fef245192b19ed989d92113388..c40d7bfae0ace73cc1e1cf8c970a150468212065 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_wm.h
+++ b/src/mesa/drivers/dri/i965/brw_wm.h
@@ -468,8 +468,6 @@ void emit_xpd(struct brw_compile *p,
              const struct brw_reg *arg0,
              const struct brw_reg *arg1);
 
-GLboolean brw_compile_shader(struct gl_context *ctx,
-                            struct gl_shader *shader);
 GLboolean brw_link_shader(struct gl_context *ctx, struct gl_shader_program *prog);
 struct gl_shader *brw_new_shader(struct gl_context *ctx, GLuint name, GLuint type);
 struct gl_shader_program *brw_new_shader_program(struct gl_context *ctx, GLuint name);

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 0947672a081505535dfdb06259be942ad556dbed..34d67b5bac82a6615a46cd4ca997ce57417813f3 100644 (file)
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -601,15 +601,6 @@ struct dd_function_table {
     * \name GLSL shader/program functions.
     */
    /*@{*/
-   /**
-    * Called when a shader is compiled.
-    *
-    * Note that not all shader objects get ShaderCompile called on
-    * them.  Notably, the shaders containing builtin functions do not
-    * have CompileShader() called, so if lowering passes are done they
-    * need to also be performed in LinkShader().
-    */
-   GLboolean (*CompileShader)(struct gl_context *ctx, struct gl_shader *shader);
    /**
     * Called when a shader program is linked.
     *

diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
index 62de23bd100e394d5b82a5b06277cb80d08c646a..33d91ad594d1ef87ee060aef62273677067f2ec1 100644 (file)
--- a/src/mesa/main/shaderobj.c
+++ b/src/mesa/main/shaderobj.c
@@ -410,6 +410,5 @@ _mesa_init_shader_object_functions(struct dd_function_table *driver)
    driver->DeleteShader = _mesa_delete_shader;
    driver->NewShaderProgram = _mesa_new_shader_program;
    driver->DeleteShaderProgram = _mesa_delete_shader_program;
-   driver->CompileShader = _mesa_ir_compile_shader;
    driver->LinkShader = _mesa_ir_link_shader;
 }

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 9578f42f1446c5f668273c3badaa4b552643f54f..17e0f9953f904b7522c54f0614cd467d35bc8186 100644 (file)
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -3093,21 +3093,6 @@ get_mesa_program(struct gl_context *ctx,
 
 extern "C" {
 
-/**
- * Called via ctx->Driver.CompilerShader().
- * This is a no-op.
- * XXX can we remove the ctx->Driver.CompileShader() hook?
- */
-GLboolean
-_mesa_ir_compile_shader(struct gl_context *ctx, struct gl_shader *shader)
-{
-   assert(shader->CompileStatus);
-   (void) ctx;
-
-   return GL_TRUE;
-}
-
-
 /**
  * Link a shader.
  * Called via ctx->Driver.LinkShader()
@@ -3293,11 +3278,6 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader)
    reparent_ir(shader->ir, shader->ir);
 
    ralloc_free(state);
-
-   if (shader->CompileStatus) {
-      if (!ctx->Driver.CompileShader(ctx, shader))
-        shader->CompileStatus = GL_FALSE;
-   }
 }