--- src/mesa/drivers/dri/i965/brw_state.h | 1 + src/mesa/drivers/dri/i965/brw_state_upload.c | 1 + src/mesa/drivers/dri/i965/brw_wm_sampler_state.c | 28 ++++++++++++++++++++++++ 3 files changed, 30 insertions(+)
diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h index d43ec0d..b54338a 100644 --- a/src/mesa/drivers/dri/i965/brw_state.h +++ b/src/mesa/drivers/dri/i965/brw_state.h @@ -69,6 +69,7 @@ extern const struct brw_tracked_state brw_state_base_address; extern const struct brw_tracked_state brw_urb_fence; extern const struct brw_tracked_state brw_vs_prog; extern const struct brw_tracked_state brw_vs_samplers; +extern const struct brw_tracked_state brw_gs_samplers; extern const struct brw_tracked_state brw_vs_ubo_surfaces; extern const struct brw_tracked_state brw_gs_ubo_surfaces; extern const struct brw_tracked_state brw_vs_unit; diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index 004e403..b6a6a0a 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -215,6 +215,7 @@ static const struct brw_tracked_state *gen7_atoms[] = &brw_fs_samplers, &brw_vs_samplers, + &brw_gs_samplers, &gen6_multisample_state, &gen7_disable_stages, 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 84cfe55..ffe4a62 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c @@ -444,6 +444,34 @@ const struct brw_tracked_state brw_vs_samplers = { }; +static void +brw_upload_gs_samplers(struct brw_context *brw) +{ + struct brw_vec4_context_base *vec4_ctx = &brw->gs.base; + + /* BRW_NEW_GEOMETRY_PROGRAM */ + struct gl_program *gs = (struct gl_program *) brw->geometry_program; + if (!gs) + return; + + brw->vtbl.upload_sampler_state_table(brw, gs, + vec4_ctx->sampler_count, + &vec4_ctx->sampler_offset, + vec4_ctx->sdc_offset); +} + + +const struct brw_tracked_state brw_gs_samplers = { + .dirty = { + .mesa = _NEW_TEXTURE, + .brw = BRW_NEW_BATCH | + BRW_NEW_GEOMETRY_PROGRAM, + .cache = 0 + }, + .emit = brw_upload_gs_samplers, +}; + + void gen4_init_vtable_sampler_functions(struct brw_context *brw) { -- 1.8.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev