From a37b2219d6e3f299379c6434d65f300660d12c3e Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 10 Jun 2010 20:23:03 -0600 Subject: mesa: refactor shader api / object code Remove the unneeded ctx->Driver hooks for shader-related functions. Move state and API-related things into main/. --- src/mesa/shader/slang/slang_link.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/mesa/shader/slang') diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c index 2d003ef9c3..6b1c153245 100644 --- a/src/mesa/shader/slang/slang_link.c +++ b/src/mesa/shader/slang/slang_link.c @@ -32,13 +32,15 @@ #include "main/imports.h" #include "main/context.h" #include "main/macros.h" +#include "main/shaderapi.h" +#include "main/shaderobj.h" #include "shader/program.h" #include "shader/prog_instruction.h" #include "shader/prog_parameter.h" #include "shader/prog_print.h" #include "shader/prog_statevars.h" #include "shader/prog_uniform.h" -#include "shader/shader_api.h" +#include "shader/uniforms.h" #include "slang_builtin.h" #include "slang_link.h" @@ -873,7 +875,7 @@ get_main_shader(GLcontext *ctx, !shader->Main || shader->UnresolvedRefs) { link_error(shProg, "Unresolved symbols"); - _mesa_free_shader(ctx, shader); + ctx->Driver.DeleteShader(ctx, shader); return NULL; } } -- cgit v1.2.3