diff options
| author | Maciej Cencora <m.cencora@gmail.com> | 2009-05-14 02:21:09 +0200 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-05-16 11:42:03 -0400 |
| commit | 73d2a4a04750b18463b51750651d3925d63ae074 (patch) | |
| tree | 5a4f5be93e47d497423eba9bced868595ae6e8f4 /src/mesa/drivers/dri/r300/r300_emit.c | |
| parent | 1b49f1ca7f9ffda8b4a75ef2ad0be4c2c0eb820a (diff) | |
r300: cleanup vertex program related functions
- move vertex program related functions to r300_vertprog.c
- use _mesa_bitcount instead of self-made bit_count function
- remove duplicated field in r300_vertex_shader_fragment.body union
- rename r300_vertex_shader_fragment to r300_vertex_shader_hw_code
- rename r300_vertex_program field native to error
- remove unnecessary r300_vertex_shader_state structure
- remove unused r300_vertex_program and r300_vertex_program_cont fields
- remove disabled code
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_emit.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_emit.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_emit.c b/src/mesa/drivers/dri/r300/r300_emit.c index 45e7074002..1e79a76b47 100644 --- a/src/mesa/drivers/dri/r300/r300_emit.c +++ b/src/mesa/drivers/dri/r300/r300_emit.c @@ -210,8 +210,7 @@ void r300EmitArrays(GLcontext * ctx) int vir_inputs[VERT_ATTRIB_MAX]; GLint tab[VERT_ATTRIB_MAX]; int swizzle[VERT_ATTRIB_MAX][4]; - struct r300_vertex_program *prog = - (struct r300_vertex_program *)CURRENT_VERTEX_SHADER(ctx); + struct r300_vertex_program *prog = rmesa->selected_vp; if (rmesa->options.hw_tcl_enabled) { inputs = prog->inputs; |