*/
static void
gen7_update_sampler_state(struct brw_context *brw, int unit, int ss_index,
- struct gen7_sampler_state *sampler)
+ struct gen7_sampler_state *sampler,
+ uint32_t *sdc_offset)
{
struct gl_context *ctx = &brw->ctx;
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
sampler->ss3.non_normalized_coord = 1;
}
- upload_default_color(brw, gl_sampler, unit, &brw->wm.sdc_offset[ss_index]);
+ upload_default_color(brw, gl_sampler, unit, sdc_offset);
- sampler->ss2.default_color_pointer = brw->wm.sdc_offset[ss_index] >> 5;
+ sampler->ss2.default_color_pointer = *sdc_offset >> 5;
if (sampler->ss0.min_filter != BRW_MAPFILTER_NEAREST)
sampler->ss3.address_round |= BRW_ADDRESS_ROUNDING_ENABLE_U_MIN |
static void
-gen7_upload_samplers(struct brw_context *brw)
+gen7_upload_sampler_state_table(struct brw_context *brw,
+ struct gl_program *prog,
+ uint32_t sampler_count,
+ uint32_t *sst_offset,
+ uint32_t *sdc_offset)
{
struct gl_context *ctx = &brw->ctx;
struct gen7_sampler_state *samplers;
- /* BRW_NEW_VERTEX_PROGRAM and BRW_NEW_FRAGMENT_PROGRAM */
- struct gl_program *vs = (struct gl_program *) brw->vertex_program;
- struct gl_program *fs = (struct gl_program *) brw->fragment_program;
+ GLbitfield SamplersUsed = prog->SamplersUsed;
- GLbitfield SamplersUsed = vs->SamplersUsed | fs->SamplersUsed;
-
- brw->wm.sampler_count = _mesa_fls(SamplersUsed);
- /* Currently we only use one sampler state table. Mirror the count. */
- brw->vs.sampler_count = brw->wm.sampler_count;
-
- if (brw->wm.sampler_count == 0)
+ if (sampler_count == 0)
return;
samplers = brw_state_batch(brw, AUB_TRACE_SAMPLER_STATE,
- brw->wm.sampler_count * sizeof(*samplers),
- 32, &brw->sampler.offset);
- memset(samplers, 0, brw->wm.sampler_count * sizeof(*samplers));
+ sampler_count * sizeof(*samplers),
+ 32, sst_offset);
+ memset(samplers, 0, sampler_count * sizeof(*samplers));
- for (unsigned s = 0; s < brw->wm.sampler_count; s++) {
+ for (unsigned s = 0; s < sampler_count; s++) {
if (SamplersUsed & (1 << s)) {
- const unsigned unit = (fs->SamplersUsed & (1 << s)) ?
- fs->SamplerUnits[s] : vs->SamplerUnits[s];
+ const unsigned unit = prog->SamplerUnits[s];
if (ctx->Texture.Unit[unit]._ReallyEnabled)
- gen7_update_sampler_state(brw, unit, s, &samplers[s]);
+ gen7_update_sampler_state(brw, unit, s, &samplers[s],
+ &sdc_offset[s]);
}
}
brw->state.dirty.cache |= CACHE_NEW_SAMPLER;
}
-const struct brw_tracked_state gen7_samplers = {
- .dirty = {
- .mesa = _NEW_TEXTURE,
- .brw = BRW_NEW_BATCH |
- BRW_NEW_VERTEX_PROGRAM |
- BRW_NEW_FRAGMENT_PROGRAM,
- .cache = 0
- },
- .emit = gen7_upload_samplers,
-};
+void
+gen7_init_vtable_sampler_functions(struct brw_context *brw)
+{
+ brw->vtbl.upload_sampler_state_table = gen7_upload_sampler_state_table;
+}