diff options
author | Brian Paul <brianp@vmware.com> | 2010-06-10 20:23:03 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2010-06-10 20:32:57 -0600 |
commit | a37b2219d6e3f299379c6434d65f300660d12c3e (patch) | |
tree | 7e3000d9f93531979452d168d542e00ebf66e6e7 /src/mesa/shader/slang/slang_link.c | |
parent | 050eed095a3f7eaeada1e292f92f2b549d74963f (diff) |
mesa: refactor shader api / object code
Remove the unneeded ctx->Driver hooks for shader-related functions.
Move state and API-related things into main/.
Diffstat (limited to 'src/mesa/shader/slang/slang_link.c')
-rw-r--r-- | src/mesa/shader/slang/slang_link.c | 6 |
1 files changed, 4 insertions, 2 deletions
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; } } |