summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2007-12-13 15:39:34 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2007-12-13 15:39:34 +0000
commit8cd608d5ba538cdebea7e9bb51c1458ce7eb5137 (patch)
tree46611f6e759069ba26148b0bb1d1d95c463f0de9
parent559750298a40ac845262365aa0d3d69e6dca0ced (diff)
downloadexternal_mesa3d-8cd608d5ba538cdebea7e9bb51c1458ce7eb5137.zip
external_mesa3d-8cd608d5ba538cdebea7e9bb51c1458ce7eb5137.tar.gz
external_mesa3d-8cd608d5ba538cdebea7e9bb51c1458ce7eb5137.tar.bz2
965: missing code from last commit
-rw-r--r--src/mesa/pipe/i965simple/brw_context.h2
-rw-r--r--src/mesa/pipe/i965simple/brw_draw.c1
-rw-r--r--src/mesa/pipe/i965simple/brw_draw_upload.c12
-rw-r--r--src/mesa/pipe/i965simple/brw_misc_state.c4
-rw-r--r--src/mesa/pipe/i965simple/brw_state.c9
5 files changed, 11 insertions, 17 deletions
diff --git a/src/mesa/pipe/i965simple/brw_context.h b/src/mesa/pipe/i965simple/brw_context.h
index 53f66cd..20528f0 100644
--- a/src/mesa/pipe/i965simple/brw_context.h
+++ b/src/mesa/pipe/i965simple/brw_context.h
@@ -489,7 +489,7 @@ struct brw_context
/* Arrays with buffer objects to copy non-bufferobj arrays into
* for upload:
*/
- struct pipe_vertex_buffer vbo_array[PIPE_ATTRIB_MAX];
+ struct pipe_vertex_buffer *vbo_array[PIPE_ATTRIB_MAX];
struct brw_vertex_element inputs[PIPE_ATTRIB_MAX];
diff --git a/src/mesa/pipe/i965simple/brw_draw.c b/src/mesa/pipe/i965simple/brw_draw.c
index f443f41..01c8ddb 100644
--- a/src/mesa/pipe/i965simple/brw_draw.c
+++ b/src/mesa/pipe/i965simple/brw_draw.c
@@ -151,7 +151,6 @@ static boolean brw_try_draw_elements( struct pipe_context *pipe,
unsigned count )
{
struct brw_context *brw = brw_context(pipe);
- boolean retval = FALSE;
/* Set the first primitive ahead of validate_state:
*/
diff --git a/src/mesa/pipe/i965simple/brw_draw_upload.c b/src/mesa/pipe/i965simple/brw_draw_upload.c
index b2168ab..7914483 100644
--- a/src/mesa/pipe/i965simple/brw_draw_upload.c
+++ b/src/mesa/pipe/i965simple/brw_draw_upload.c
@@ -217,18 +217,18 @@ boolean brw_upload_vertex_buffers( struct brw_context *brw )
for (i = 0; i < BRW_VEP_MAX; i++)
{
- if (brw->vb.vbo_array[i] == NULL) {
+ if (brw->vb.vbo_array[i]->buffer == NULL) {
nr_enabled = i;
break;
}
- vbp.vb[i].vb0.bits.pitch = brw->vb.vbo_array[i].pitch;
+ vbp.vb[i].vb0.bits.pitch = brw->vb.vbo_array[i]->pitch;
vbp.vb[i].vb0.bits.pad = 0;
vbp.vb[i].vb0.bits.access_type = BRW_VERTEXBUFFER_ACCESS_VERTEXDATA;
vbp.vb[i].vb0.bits.vb_index = i;
- vbp.vb[i].offset = brw->vb.vbo_array[i].buffer_offset;
- vbp.vb[i].buffer = brw->vb.vbo_array[i].buffer;
- vbp.vb[i].max_index = brw->vb.vbo_array[i].max_index;
+ vbp.vb[i].offset = brw->vb.vbo_array[i]->buffer_offset;
+ vbp.vb[i].buffer = brw->vb.vbo_array[i]->buffer;
+ vbp.vb[i].max_index = brw->vb.vbo_array[i]->max_index;
}
@@ -263,7 +263,7 @@ boolean brw_upload_vertex_elements( struct brw_context *brw )
for (i = 0; i < nr_enabled; i++) {
struct brw_vertex_element *input = &brw->vb.inputs[i];
- switch (brw->vb.vbo_array[input->vep.ve0.vertex_buffer_index].pitch) {
+ switch (brw->vb.vbo_array[input->vep.ve0.vertex_buffer_index]->pitch) {
case 0: input->vep.ve1.vfcomponent0 = BRW_VFCOMPONENT_STORE_0;
case 1: input->vep.ve1.vfcomponent1 = BRW_VFCOMPONENT_STORE_0;
case 2: input->vep.ve1.vfcomponent2 = BRW_VFCOMPONENT_STORE_0;
diff --git a/src/mesa/pipe/i965simple/brw_misc_state.c b/src/mesa/pipe/i965simple/brw_misc_state.c
index 0750502..2ba4d3a 100644
--- a/src/mesa/pipe/i965simple/brw_misc_state.c
+++ b/src/mesa/pipe/i965simple/brw_misc_state.c
@@ -202,9 +202,7 @@ static void upload_depthbuffer(struct brw_context *brw)
OUT_BATCH(((depth_surface->pitch * depth_surface->cpp) - 1) |
(format << 18) |
(BRW_TILEWALK_YMAJOR << 26) |
-#if 0
- (depth_surface->region->tiled << 27) |
-#endif
+// (depth_surface->region->tiled << 27) |
(BRW_SURFACE_2D << 29));
OUT_RELOC(depth_surface->buffer,
PIPE_BUFFER_FLAG_READ | PIPE_BUFFER_FLAG_WRITE, 0);
diff --git a/src/mesa/pipe/i965simple/brw_state.c b/src/mesa/pipe/i965simple/brw_state.c
index ff4ae79..f1eba14 100644
--- a/src/mesa/pipe/i965simple/brw_state.c
+++ b/src/mesa/pipe/i965simple/brw_state.c
@@ -273,14 +273,11 @@ static void brw_set_viewport_state( struct pipe_context *pipe,
static void brw_set_vertex_buffer( struct pipe_context *pipe,
- unsigned index,
- const struct pipe_vertex_buffer *buffer )
+ unsigned index,
+ const struct pipe_vertex_buffer *buffer )
{
struct brw_context *brw = brw_context(pipe);
- brw->vb.vbo_array[index] = *buffer;
- if (index > brw->vb.last_vb)
- brw->vb.last_vb = index;
- assert(brw->vb.last_vb < BRW_VEP_MAX);
+ brw->vb.vbo_array[index] = buffer;
}
static void brw_set_vertex_element(struct pipe_context *pipe,