diff options
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_link.cpp | 11 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_program.c | 1 | ||||
-rw-r--r-- | src/mesa/main/dd.h | 7 | ||||
-rw-r--r-- | src/mesa/main/shaderobj.c | 17 | ||||
-rw-r--r-- | src/mesa/main/shaderobj.h | 3 |
5 files changed, 0 insertions, 39 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_link.cpp b/src/mesa/drivers/dri/i965/brw_link.cpp index 902a693ebdf..380e454716e 100644 --- a/src/mesa/drivers/dri/i965/brw_link.cpp +++ b/src/mesa/drivers/dri/i965/brw_link.cpp @@ -174,17 +174,6 @@ process_glsl_ir(struct brw_context *brw, } } -extern "C" struct gl_linked_shader * -brw_new_shader(gl_shader_stage stage) -{ - struct gl_linked_shader *shader = rzalloc(NULL, struct gl_linked_shader); - if (shader) { - shader->Stage = stage; - } - - return shader; -} - static void unify_interfaces(struct shader_info **infos) { diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index fa54c2ac61a..168e3ffa9a7 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -375,7 +375,6 @@ void brwInitFragProgFuncs( struct dd_function_table *functions ) functions->DeleteProgram = brwDeleteProgram; functions->ProgramStringNotify = brwProgramStringNotify; - functions->NewShader = brw_new_shader; functions->LinkShader = brw_link_shader; functions->MemoryBarrier = brw_memory_barrier; diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 1d75b9fc29b..21e8260fc78 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -780,13 +780,6 @@ struct dd_function_table { /*@}*/ /** - * \name GLSL-related functions (ARB extensions and OpenGL 2.x) - */ - /*@{*/ - struct gl_linked_shader *(*NewShader)(gl_shader_stage stage); - /*@}*/ - - /** * \name GREMEDY debug/marker functions */ /*@{*/ diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index 2071ffff45d..7b73f5691dd 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -116,22 +116,6 @@ _mesa_new_shader(GLuint name, gl_shader_stage stage) /** - * Allocate a new gl_linked_shader object. - * Called via ctx->Driver.NewShader() - */ -struct gl_linked_shader * -_mesa_new_linked_shader(gl_shader_stage stage) -{ - struct gl_linked_shader *shader; - shader = rzalloc(NULL, struct gl_linked_shader); - if (shader) { - shader->Stage = stage; - } - return shader; -} - - -/** * Delete a shader object. */ void @@ -505,6 +489,5 @@ _mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name, void _mesa_init_shader_object_functions(struct dd_function_table *driver) { - driver->NewShader = _mesa_new_linked_shader; driver->LinkShader = _mesa_ir_link_shader; } diff --git a/src/mesa/main/shaderobj.h b/src/mesa/main/shaderobj.h index c5153d09ba4..b7dae62bcb4 100644 --- a/src/mesa/main/shaderobj.h +++ b/src/mesa/main/shaderobj.h @@ -83,9 +83,6 @@ _mesa_reference_shader_program(struct gl_context *ctx, extern struct gl_shader * _mesa_new_shader(GLuint name, gl_shader_stage type); -extern struct gl_linked_shader * -_mesa_new_linked_shader(gl_shader_stage type); - extern void _mesa_delete_shader(struct gl_context *ctx, struct gl_shader *sh); |