diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-23 16:01:59 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-23 16:01:59 +1100 |
| commit | 6c14cf58343135491068e96575bf4e61a6d34c87 (patch) | |
| tree | 0b826725f867a706d558492ac9abf881ab06e7a5 /src/mesa/pipe/i965simple/brw_wm_sampler_state.c | |
| parent | bf2410ca73d1eabc7134e51855d0b603897229e4 (diff) | |
| parent | 4fa7afabc966a3d37324f2f9b03e1cc466db7773 (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Diffstat (limited to 'src/mesa/pipe/i965simple/brw_wm_sampler_state.c')
| -rw-r--r-- | src/mesa/pipe/i965simple/brw_wm_sampler_state.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/pipe/i965simple/brw_wm_sampler_state.c b/src/mesa/pipe/i965simple/brw_wm_sampler_state.c index fbeea8c809..cfb430eb09 100644 --- a/src/mesa/pipe/i965simple/brw_wm_sampler_state.c +++ b/src/mesa/pipe/i965simple/brw_wm_sampler_state.c @@ -236,7 +236,8 @@ static void upload_wm_samplers(struct brw_context *brw) /* BRW_NEW_SAMPLER */ for (unit = 0; unit < BRW_MAX_TEX_UNIT; unit++) { - if (brw->attribs.Samplers[unit]) { /* FIXME: correctly detect enabled ones */ + /* determine unit enable/disable by looking for a bound texture */ + if (brw->attribs.Texture[unit]) { const struct pipe_sampler_state *sampler = brw->attribs.Samplers[unit]; unsigned sdc_gs_offset = upload_default_color(brw, sampler->border_color); |