diff options
| author | Keith Packard <keithp@keithp.com> | 2008-05-07 20:20:26 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2008-05-07 20:20:26 -0700 |
| commit | 68a916183276f727948e73fe752ebf36ef9f8ba9 (patch) | |
| tree | faa32fc5fe6865e0c46269d74945cfa3f95ebb3a /src/mesa/drivers/dri/i965/brw_wm_sampler_state.c | |
| parent | c75b2d74d88e9926cbd10aa1eee4aeba93ba4850 (diff) | |
| parent | ead798eb103e4cfe801704bc15eb4fe8df078fa8 (diff) | |
Merge commit 'anholt/drm-gem' into drm-gem
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_wm_sampler_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_sampler_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c index d40332e9ae..13f7f21800 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c @@ -306,7 +306,7 @@ static int upload_wm_samplers( struct brw_context *brw ) ret |= dri_bufmgr_check_aperture_space(brw->wm.sdc_bo[i]); dri_emit_reloc(brw->wm.sampler_bo, - DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_READ, + DRM_GEM_DOMAIN_I915_INSTRUCTION, 0, 0, i * sizeof(struct brw_sampler_state) + offsetof(struct brw_sampler_state, ss2), |