Mesa (master): vbo: Clean up unused variables in the vbo module.
Mathias Fröhlich
frohlich at kemper.freedesktop.org
Sat Oct 22 11:26:38 UTC 2011
Module: Mesa
Branch: master
Commit: 409748ac0b92aacae6ad9c2bcedca4fef8986eea
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=409748ac0b92aacae6ad9c2bcedca4fef8986eea
Author: Mathias Froehlich <Mathias.Froehlich at web.de>
Date: Wed Aug 3 08:10:52 2011 +0200
vbo: Clean up unused variables in the vbo module.
Remove some unused or unused but set variables
from the vbo module.
---
src/mesa/vbo/vbo_exec.h | 9 ---------
src/mesa/vbo/vbo_exec_array.c | 7 +------
src/mesa/vbo/vbo_save.h | 1 -
3 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/src/mesa/vbo/vbo_exec.h b/src/mesa/vbo/vbo_exec.h
index 9a1b5a1..0b72579 100644
--- a/src/mesa/vbo/vbo_exec.h
+++ b/src/mesa/vbo/vbo_exec.h
@@ -78,9 +78,6 @@ struct vbo_exec_copied_vtx {
};
-typedef void (*vbo_attrfv_func)( const GLfloat * );
-
-
struct vbo_exec_context
{
struct gl_context *ctx;
@@ -113,8 +110,6 @@ struct vbo_exec_context
* values are squashed down to the 32 attributes passed to the
* vertex program below:
*/
- enum vp_mode program_mode;
- GLuint enabled_flags;
const struct gl_client_array *inputs[VERT_ATTRIB_MAX];
} vtx;
@@ -126,10 +121,6 @@ struct vbo_exec_context
} eval;
struct {
- enum vp_mode program_mode;
- GLuint enabled_flags;
- GLuint array_obj;
-
/* These just mirror the current arrayobj (todo: make arrayobj
* look like this and remove the mirror):
*/
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index 4e4f2c9..7023380 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -422,8 +422,6 @@ bind_array_obj(struct gl_context *ctx)
assert(i < Elements(exec->array.generic_array));
exec->array.generic_array[i] = &arrayObj->VertexAttrib[i];
}
-
- exec->array.array_obj = arrayObj->Name;
}
@@ -444,10 +442,7 @@ recalculate_input_bindings(struct gl_context *ctx)
GLbitfield const_inputs = 0x0;
GLuint i;
- exec->array.program_mode = get_program_mode(ctx);
- exec->array.enabled_flags = ctx->Array.ArrayObj->_Enabled;
-
- switch (exec->array.program_mode) {
+ switch (get_program_mode(ctx)) {
case VP_NONE:
/* When no vertex program is active (or the vertex program is generated
* from fixed-function state). We put the material values into the
diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h
index a064090..a85a7cb 100644
--- a/src/mesa/vbo/vbo_save.h
+++ b/src/mesa/vbo/vbo_save.h
@@ -146,7 +146,6 @@ struct vbo_save_context {
GLuint vert_count;
GLuint max_vert;
GLboolean dangling_attr_ref;
- GLboolean have_materials;
GLuint opcode_vertex_list;
More information about the mesa-commit
mailing list