On 08/27/2015 09:19 AM, Pohjolainen, Topi wrote: > On Wed, Aug 26, 2015 at 06:19:52PM +0100, Ian Romanick wrote: >> From: Ian Romanick <ian.d.roman...@intel.com> >> >> All of the other state upload functions are static because the only use >> is in the brw_tracked_state structure. > > If and when I get my "i965-meta-ops reusing blorp launch"-series to be > available again, I need to include a revert for this - it is needed for > gen8 adaptation. In the meanwhile:
Okay. This partially enables a follow-on patch that I should send out next week. I need to finish collecting performance data, and my performance testing set up is 5,000 miles away... > Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> > >> Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> >> --- >> src/mesa/drivers/dri/i965/brw_state.h | 4 ---- >> src/mesa/drivers/dri/i965/gen8_misc_state.c | 3 ++- >> 2 files changed, 2 insertions(+), 5 deletions(-) >> >> diff --git a/src/mesa/drivers/dri/i965/brw_state.h >> b/src/mesa/drivers/dri/i965/brw_state.h >> index 78a1f87..da8a478 100644 >> --- a/src/mesa/drivers/dri/i965/brw_state.h >> +++ b/src/mesa/drivers/dri/i965/brw_state.h >> @@ -177,10 +177,6 @@ void brw_upload_invariant_state(struct brw_context >> *brw); >> uint32_t >> brw_depthbuffer_format(struct brw_context *brw); >> >> -/* gen8_misc_state.c */ >> -void gen8_upload_state_base_address(struct brw_context *brw); >> - >> - >> /*********************************************************************** >> * brw_state.c >> */ >> diff --git a/src/mesa/drivers/dri/i965/gen8_misc_state.c >> b/src/mesa/drivers/dri/i965/gen8_misc_state.c >> index b20038e..a46b252 100644 >> --- a/src/mesa/drivers/dri/i965/gen8_misc_state.c >> +++ b/src/mesa/drivers/dri/i965/gen8_misc_state.c >> @@ -29,7 +29,8 @@ >> /** >> * Define the base addresses which some state is referenced from. >> */ >> -void gen8_upload_state_base_address(struct brw_context *brw) >> +static void >> +gen8_upload_state_base_address(struct brw_context *brw) >> { >> uint32_t mocs_wb = brw->gen >= 9 ? SKL_MOCS_WB : BDW_MOCS_WB; >> int pkt_len = brw->gen >= 9 ? 19 : 16; >> -- >> 2.1.0 >> >> _______________________________________________ >> mesa-dev mailing list >> mesa-dev@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev