summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i965/brw_exec.h
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2006-09-06 18:30:00 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2006-09-06 18:30:00 +0000
commit14ec34d64733478b773190cb62be37b7b2871a7f (patch)
tree3935796705a0f28df41cf5fe9d79284448235bb9 /src/mesa/drivers/dri/i965/brw_exec.h
parent2216aac8ea2ab90cdf71658379f88f30131426c5 (diff)
Simplify the immediate and displaylist code. Treat VertexAttrib*ARB
as non-aliasing and cope with the >32 attributes that result, taking materials into account.
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_exec.h')
-rw-r--r--src/mesa/drivers/dri/i965/brw_exec.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_exec.h b/src/mesa/drivers/dri/i965/brw_exec.h
index 2fa111dc8b..f07b448587 100644
--- a/src/mesa/drivers/dri/i965/brw_exec.h
+++ b/src/mesa/drivers/dri/i965/brw_exec.h
@@ -95,9 +95,9 @@ struct brw_exec_context
GLuint max_vert;
struct brw_exec_copied_vtx copied;
- brw_attrfv_func tabfv[BRW_MAX_ATTR_CODEGEN+1][4]; /* plus 1 for ERROR_ATTRIB */
-
GLubyte attrsz[BRW_ATTRIB_MAX];
+ GLubyte active_sz[BRW_ATTRIB_MAX];
+
GLfloat *attrptr[BRW_ATTRIB_MAX];
struct gl_client_array arrays[BRW_ATTRIB_MAX];
const struct gl_client_array *inputs[BRW_ATTRIB_MAX];
@@ -111,10 +111,7 @@ struct brw_exec_context
} eval;
struct {
- GLboolean recalculate_inputs;
const struct gl_client_array *inputs[BRW_ATTRIB_MAX];
- const struct gl_client_array *attrib_arrays[BRW_ATTRIB_MAX];
- const struct gl_client_array *legacy_arrays[BRW_ATTRIB_MAX];
struct gl_buffer_object *index_obj;
} array;
@@ -150,11 +147,4 @@ void brw_exec_do_EvalCoord2f( struct brw_exec_context *exec,
void brw_exec_do_EvalCoord1f( struct brw_exec_context *exec,
GLfloat u);
-
-
-void brw_exec_vtx_generic_init( struct brw_exec_context *exec );
-
-void brw_exec_generic_attr_table_init( brw_attrfv_func (*tab)[4] );
-
-
#endif