diff options
| author | Christian König <[email protected]> | 2011-01-12 00:48:10 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-12 00:48:10 +0100 |
| commit | a96fe679e2f57e8e4e26c38660d8b6e5b67d5b4b (patch) | |
| tree | d106cfea4baa1a9071b42d0e9bc922fad7502ed5 /src/gallium/drivers/i965/brw_urb.c | |
| parent | 7965e2fc16853ae0ed0a9cde77346c25feb19b6e (diff) | |
| parent | cc0f604241ee7b536f4c9867573024b8673b0998 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_shader.c
Diffstat (limited to 'src/gallium/drivers/i965/brw_urb.c')
| -rw-r--r-- | src/gallium/drivers/i965/brw_urb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/i965/brw_urb.c b/src/gallium/drivers/i965/brw_urb.c index 907ec56c6ca..b630752809e 100644 --- a/src/gallium/drivers/i965/brw_urb.c +++ b/src/gallium/drivers/i965/brw_urb.c @@ -147,7 +147,7 @@ static int recalculate_urb_fence( struct brw_context *brw ) brw->urb.constrained = 0; - if (BRW_IS_IGDNG(brw)) { + if (brw->gen == 5) { brw->urb.nr_vs_entries = 128; brw->urb.nr_sf_entries = 48; if (check_urb_layout(brw)) { @@ -157,7 +157,7 @@ static int recalculate_urb_fence( struct brw_context *brw ) brw->urb.nr_vs_entries = limits[VS].preferred_nr_entries; brw->urb.nr_sf_entries = limits[SF].preferred_nr_entries; } - } else if (BRW_IS_G4X(brw)) { + } else if (brw->is_g4x) { brw->urb.nr_vs_entries = 64; if (check_urb_layout(brw)) { goto done; |