diff options
| author | Brian Paul <[email protected]> | 2010-06-10 20:23:03 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-06-10 20:32:57 -0600 |
| commit | a37b2219d6e3f299379c6434d65f300660d12c3e (patch) | |
| tree | 7e3000d9f93531979452d168d542e00ebf66e6e7 /src/mesa/state_tracker | |
| 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/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_program.c | 8 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_context.c | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/mesa/state_tracker/st_cb_program.c b/src/mesa/state_tracker/st_cb_program.c index 2361b2eddfe..d0c9772e8ef 100644 --- a/src/mesa/state_tracker/st_cb_program.c +++ b/src/mesa/state_tracker/st_cb_program.c @@ -33,10 +33,11 @@ #include "main/glheader.h" #include "main/macros.h" #include "main/enums.h" +#include "main/shaderapi.h" +#include "main/shaderobj.h" #include "shader/prog_instruction.h" #include "shader/prog_parameter.h" #include "shader/program.h" -#include "shader/shader_api.h" #include "cso_cache/cso_context.h" #include "draw/draw_context.h" @@ -75,15 +76,12 @@ static void st_bind_program( GLcontext *ctx, * Called via ctx->Driver.UseProgram() to bind a linked GLSL program * (vertex shader + fragment shader). */ -static void st_use_program( GLcontext *ctx, - GLuint program ) +static void st_use_program( GLcontext *ctx, struct gl_shader_program *shProg) { struct st_context *st = st_context(ctx); st->dirty.st |= ST_NEW_FRAGMENT_PROGRAM; st->dirty.st |= ST_NEW_VERTEX_PROGRAM; - - _mesa_use_program(ctx, program); } diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 0bf030e9876..4b809b61143 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -27,8 +27,8 @@ #include "main/imports.h" #include "main/context.h" +#include "main/shaderobj.h" #include "vbo/vbo.h" -#include "shader/shader_api.h" #include "glapi/glapi.h" #include "st_context.h" #include "st_debug.h" @@ -254,7 +254,7 @@ void st_destroy_context( struct st_context *st ) void st_init_driver_functions(struct dd_function_table *functions) { - _mesa_init_glsl_driver_functions(functions); + _mesa_init_shader_object_functions(functions); st_init_accum_functions(functions); st_init_blit_functions(functions); |