diff options
| author | José Fonseca <jfonseca@vmware.com> | 2009-03-02 13:27:46 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2009-03-02 13:27:46 +0000 |
| commit | 97a1fd158c9acfaa3a8deda7eb5bf0b253e85c15 (patch) | |
| tree | 37e6c11507c1ef044aa8f0ee009136bb1d8b5bbc /src/mesa/drivers/dri/i965/brw_curbe.c | |
| parent | 60e5fe65067da76dea816535bec1e9073adc0ba7 (diff) | |
| parent | b70f344e223fc10df8df08a6d82a813505225712 (diff) | |
Merge commit 'origin/master' into gallium-map-range
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_curbe.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_curbe.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c b/src/mesa/drivers/dri/i965/brw_curbe.c index 4eaaa5f871..4ec0cfb816 100644 --- a/src/mesa/drivers/dri/i965/brw_curbe.c +++ b/src/mesa/drivers/dri/i965/brw_curbe.c @@ -138,24 +138,24 @@ const struct brw_tracked_state brw_curbe_offsets = { * fixed-function hardware in a double-buffering scheme to avoid a * pipeline stall each time the contents of the curbe is changed. */ -void brw_upload_constant_buffer_state(struct brw_context *brw) +void brw_upload_cs_urb_state(struct brw_context *brw) { - struct brw_constant_buffer_state cbs; - memset(&cbs, 0, sizeof(cbs)); + struct brw_cs_urb_state cs_urb; + memset(&cs_urb, 0, sizeof(cs_urb)); /* It appears that this is the state packet for the CS unit, ie. the * urb entries detailed here are housed in the CS range from the * URB_FENCE command. */ - cbs.header.opcode = CMD_CONST_BUFFER_STATE; - cbs.header.length = sizeof(cbs)/4 - 2; + cs_urb.header.opcode = CMD_CS_URB_STATE; + cs_urb.header.length = sizeof(cs_urb)/4 - 2; /* BRW_NEW_URB_FENCE */ - cbs.bits0.nr_urb_entries = brw->urb.nr_cs_entries; - cbs.bits0.urb_entry_size = brw->urb.csize - 1; + cs_urb.bits0.nr_urb_entries = brw->urb.nr_cs_entries; + cs_urb.bits0.urb_entry_size = brw->urb.csize - 1; assert(brw->urb.nr_cs_entries); - BRW_CACHED_BATCH_STRUCT(brw, &cbs); + BRW_CACHED_BATCH_STRUCT(brw, &cs_urb); } static GLfloat fixed_plane[6][4] = { |