From 530de3a2f5f6c1f1a6ec7a5f781d90f7229cab2a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 21 Apr 2011 18:33:22 -0700 Subject: [PATCH] i965: Give the push constants and pull constants unique function names. This helps clarify profiling results. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 4 ++-- src/mesa/drivers/dri/i965/gen6_wm_state.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index f1a9d86b20a..47b8b511f05 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -315,7 +315,7 @@ brw_create_constant_surface(struct brw_context *brw, * state atom. */ static void -prepare_wm_constants(struct brw_context *brw) +prepare_wm_pull_constants(struct brw_context *brw) { struct gl_context *ctx = &brw->intel.ctx; struct intel_context *intel = &brw->intel; @@ -359,7 +359,7 @@ const struct brw_tracked_state brw_wm_constants = { .brw = (BRW_NEW_FRAGMENT_PROGRAM), .cache = 0 }, - .prepare = prepare_wm_constants, + .prepare = prepare_wm_pull_constants, }; /** diff --git a/src/mesa/drivers/dri/i965/gen6_wm_state.c b/src/mesa/drivers/dri/i965/gen6_wm_state.c index d4fca788cb9..c4b57fe1f95 100644 --- a/src/mesa/drivers/dri/i965/gen6_wm_state.c +++ b/src/mesa/drivers/dri/i965/gen6_wm_state.c @@ -35,7 +35,7 @@ #include "intel_batchbuffer.h" static void -prepare_wm_constants(struct brw_context *brw) +gen6_prepare_wm_push_constants(struct brw_context *brw) { struct intel_context *intel = &brw->intel; struct gl_context *ctx = &intel->ctx; @@ -91,7 +91,7 @@ const struct brw_tracked_state gen6_wm_constants = { .brw = BRW_NEW_FRAGMENT_PROGRAM, .cache = 0, }, - .prepare = prepare_wm_constants, + .prepare = gen6_prepare_wm_push_constants, }; static void -- 2.11.0