From 0c994f181ce1a09cdbb7db27e4ad5565248bf8e1 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Sat, 16 Feb 2013 08:45:09 -0800 Subject: i965/vs: split brw_vs_prog_key into generic and VS-specific parts. This will allow the generic parts to be re-used for geometry shaders. Reviewed-by: Jordan Justen Reviewed-by: Eric Anholt Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_vs.h | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'src/mesa/drivers/dri/i965/brw_vs.h') diff --git a/src/mesa/drivers/dri/i965/brw_vs.h b/src/mesa/drivers/dri/i965/brw_vs.h index c2b4bc6..e1c6ed0 100644 --- a/src/mesa/drivers/dri/i965/brw_vs.h +++ b/src/mesa/drivers/dri/i965/brw_vs.h @@ -50,14 +50,9 @@ #define BRW_ATTRIB_WA_SIGN 32 /* interpret as signed in shader */ #define BRW_ATTRIB_WA_SCALE 64 /* interpret as scaled in shader */ -struct brw_vs_prog_key { +struct brw_vec4_prog_key { GLuint program_string_id; - /* - * Per-attribute workaround flags - */ - uint8_t gl_attrib_wa_flags[VERT_ATTRIB_MAX]; - /** * True if at least one clip flag is enabled, regardless of whether the * shader uses clip planes or gl_ClipDistance. @@ -85,6 +80,20 @@ struct brw_vs_prog_key { */ GLuint userclip_planes_enabled_gen_4_5:MAX_CLIP_PLANES; + GLuint clamp_vertex_color:1; + + struct brw_sampler_prog_key_data tex; +}; + + +struct brw_vs_prog_key { + struct brw_vec4_prog_key base; + + /* + * Per-attribute workaround flags + */ + uint8_t gl_attrib_wa_flags[VERT_ATTRIB_MAX]; + GLuint copy_edgeflag:1; /** @@ -96,10 +105,6 @@ struct brw_vs_prog_key { * the VUE, even if they aren't written by the vertex shader. */ GLuint point_coord_replace:8; - - GLuint clamp_vertex_color:1; - - struct brw_sampler_prog_key_data tex; }; -- cgit v1.1