diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-08-24 17:52:40 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-08-24 17:52:40 +1000 |
| commit | 7c81124d7c4a4d1da9f48cbf7e82ab1a3a970a7a (patch) | |
| tree | 832251b8ecfc3282c1748187350ceb0e3a5cdc9f /src/mesa/drivers/dri/i965/brw_urb.c | |
| parent | a35002c1673a1a37ec79b237dda7e8f6b9c9962a (diff) | |
| download | external_mesa3d-7c81124d7c4a4d1da9f48cbf7e82ab1a3a970a7a.zip external_mesa3d-7c81124d7c4a4d1da9f48cbf7e82ab1a3a970a7a.tar.gz external_mesa3d-7c81124d7c4a4d1da9f48cbf7e82ab1a3a970a7a.tar.bz2 | |
Revert "Merge branch 'drm-gem'"
This reverts commit 53675e5c05c0598b7ea206d5c27dbcae786a2c03.
Conflicts:
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_urb.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_urb.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_urb.c b/src/mesa/drivers/dri/i965/brw_urb.c index 1116ade..c423dbe 100644 --- a/src/mesa/drivers/dri/i965/brw_urb.c +++ b/src/mesa/drivers/dri/i965/brw_urb.c @@ -74,7 +74,7 @@ static GLboolean check_urb_layout( struct brw_context *brw ) /* Most minimal update, forces re-emit of URB fence packet after GS * unit turned on/off. */ -static void recalculate_urb_fence( struct brw_context *brw ) +static int recalculate_urb_fence( struct brw_context *brw ) { GLuint csize = brw->curbe.total_size; GLuint vsize = brw->vs.prog_data->urb_entry_size; @@ -142,6 +142,7 @@ static void recalculate_urb_fence( struct brw_context *brw ) brw->state.dirty.brw |= BRW_NEW_URB_FENCE; } + return 0; } @@ -186,3 +187,15 @@ void brw_upload_urb_fence(struct brw_context *brw) BRW_BATCH_STRUCT(brw, &uf); } + + +#if 0 +const struct brw_tracked_state brw_urb_fence = { + .dirty = { + .mesa = 0, + .brw = BRW_NEW_URB_FENCE | BRW_NEW_PSP, + .cache = 0 + }, + .update = brw_upload_urb_fence +}; +#endif |