In f3e9ccb3b, I renamed gen6_upload_wm_constants to gen6_upload_wm_push_constants, but neglected to update this comment.
I don't think there ever was a gen7_prepare_wm_constants function; it was probably a search and replace error. Of course, "prepare" functions died a while back as well. Signed-off-by: Kenneth Graunke <kenn...@whitecape.org> --- src/mesa/drivers/dri/i965/gen6_wm_state.c | 2 +- src/mesa/drivers/dri/i965/gen7_wm_state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/gen6_wm_state.c b/src/mesa/drivers/dri/i965/gen6_wm_state.c index c04f234..0547eb8 100644 --- a/src/mesa/drivers/dri/i965/gen6_wm_state.c +++ b/src/mesa/drivers/dri/i965/gen6_wm_state.c @@ -118,7 +118,7 @@ upload_wm_state(struct brw_context *brw) GEN6_CONSTANT_BUFFER_0_ENABLE | (5 - 2)); /* Pointer to the WM constant buffer. Covered by the set of - * state flags from gen6_upload_wm_constants + * state flags from gen6_upload_wm_push_constants. */ OUT_BATCH(brw->wm.push_const_offset + ALIGN(brw->wm.prog_data->nr_params, diff --git a/src/mesa/drivers/dri/i965/gen7_wm_state.c b/src/mesa/drivers/dri/i965/gen7_wm_state.c index 260d2e2..5045991 100644 --- a/src/mesa/drivers/dri/i965/gen7_wm_state.c +++ b/src/mesa/drivers/dri/i965/gen7_wm_state.c @@ -133,7 +133,7 @@ upload_ps_state(struct brw_context *brw) brw->wm.prog_data->dispatch_width) / 8); OUT_BATCH(0); /* Pointer to the WM constant buffer. Covered by the set of - * state flags from gen7_prepare_wm_constants + * state flags from gen6_upload_wm_push_constants. */ OUT_BATCH(brw->wm.push_const_offset); OUT_BATCH(0); -- 1.7.7.5 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev