fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-11 21:00:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Kenneth Graunke 2011-02-26 00:42:24 -08:00
parent cbadedb511
commit 5e9aa9926b
6 changed files with 0 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/mesa/drivers/dri/i965/brw_fs.cpp
View file

@ -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)
{

1
src/mesa/drivers/dri/i965/brw_program.c
View file

@ -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;
}

2
src/mesa/drivers/dri/i965/brw_wm.h
View file

@ -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);

9
src/mesa/main/dd.h
View file

@ -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.
*

1
src/mesa/main/shaderobj.c
View file

@ -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;
}

20
src/mesa/program/ir_to_mesa.cpp
View file

@ -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;
}
}