On 29 August 2013 15:56, Chad Versace <chad.vers...@linux.intel.com> wrote:
> On 08/26/2013 03:12 PM, Paul Berry wrote: > >> "ff" is for "fixed function". This frees up the name "gs" to refer to >> user-defined geometry shaders. >> --- >> src/mesa/drivers/dri/i965/brw_**context.h | 14 +-- >> src/mesa/drivers/dri/i965/brw_**gs.c | 42 ++++---- >> src/mesa/drivers/dri/i965/brw_**gs.h | 19 ++-- >> src/mesa/drivers/dri/i965/brw_**gs_emit.c | 150 >> ++++++++++++++------------- >> src/mesa/drivers/dri/i965/brw_**gs_state.c | 17 +-- >> src/mesa/drivers/dri/i965/brw_**misc_state.c | 10 +- >> src/mesa/drivers/dri/i965/brw_**state.h | 2 +- >> src/mesa/drivers/dri/i965/brw_**state_dump.c | 4 +- >> src/mesa/drivers/dri/i965/brw_**state_upload.c | 8 +- >> src/mesa/drivers/dri/i965/**gen6_gs_state.c | 10 +- >> src/mesa/drivers/dri/i965/**gen6_sol.c | 12 +-- >> src/mesa/drivers/dri/i965/**gen6_urb.c | 8 +- >> src/mesa/drivers/dri/i965/**gen7_disable.c | 2 +- >> src/mesa/drivers/dri/i965/**gen7_urb.c | 4 +- >> 14 files changed, 156 insertions(+), 146 deletions(-) >> > > > > @@ -208,7 +209,7 @@ static void brw_gs_emit_vue(struct brw_gs_compile *c, >> * the allocated URB entry (which will be needed by the URB_WRITE >> meesage that >> * follows). >> */ >> -static void brw_gs_ff_sync(struct brw_gs_compile *c, int num_prim) >> +static void brw_ff_gs_ff_sync(struct brw_ff_gs_compile *c, int num_prim) >> { >> struct brw_compile *p = &c->func; >> >> > Looks like you double-edited this hunk. "brw_ff_gs_ff". > Sadly, no. The first "ff" is the "ff" I'm adding. The second "ff" is part of "ff_sync", which is the name of a URB message (see Graphics BSpec: 3D-Media-GPGPU Engine > Shared Functions > URB > URB Messages [DevSNB] > FF_SYNC Messages). It's a rather unfortunate coincidence that makes the name look like a mistake :( > > Fix that, and patch 1 is > Reviewed-by: Chad Versace <chad.vers...@linux.intel.com> >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev