From ec9c3882d949298366c872f766d3d18c6ae93f8e Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Fri, 22 Mar 2013 09:39:11 -0700 Subject: i965: Clarify nomenclature: vert_result -> varying This patch removes the terminology "vert_result" from the i965 driver, replacing it with "varying". The old terminology, "vert_result", was confusing because (a) it referred to the enum gl_vert_result, which no longer exists (it was replaced with gl_varying_slot), and (b) it implied a vertex output, but with the advent of geometry shaders, it could be either a vertex or a geometry output, depending what shaders are in use. The generic term "varying" is less confusing. No functional change. Reviewed-by: Ian Romanick Reviewed-by: Eric Anholt Reviewed-by: Kenneth Graunke v2: Whitespace fixes. --- src/mesa/drivers/dri/i965/brw_clip.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mesa/drivers/dri/i965/brw_clip.h') diff --git a/src/mesa/drivers/dri/i965/brw_clip.h b/src/mesa/drivers/dri/i965/brw_clip.h index 9185651470a..c6581adcf0a 100644 --- a/src/mesa/drivers/dri/i965/brw_clip.h +++ b/src/mesa/drivers/dri/i965/brw_clip.h @@ -116,12 +116,12 @@ struct brw_clip_compile { #define ATTR_SIZE (4*4) /** - * True if the given vert_result is one of the outputs of the vertex shader. + * True if the given varying is one of the outputs of the vertex shader. */ -static inline bool brw_clip_have_vert_result(struct brw_clip_compile *c, - GLuint vert_result) +static inline bool brw_clip_have_varying(struct brw_clip_compile *c, + GLuint varying) { - return (c->key.attrs & BITFIELD64_BIT(vert_result)) ? 1 : 0; + return (c->key.attrs & BITFIELD64_BIT(varying)) ? 1 : 0; } /* Points are only culled, so no need for a clip routine, however it -- cgit v1.2.3