From e2ce1d80d10d700cf15b84d0ec1605875226629e Mon Sep 17 00:00:00 2001 From: Maciej Cencora Date: Tue, 7 Apr 2009 21:08:40 +1000 Subject: r300: swtcl rewrite and cleanup - remove unused variables - silence compiler warnings - fix twosided lighting - fix point attenuation - unify indentation --- src/mesa/drivers/dri/r300/r300_context.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/mesa/drivers/dri/r300/r300_context.h') diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h index 5ef59d258e..86e68e35fc 100644 --- a/src/mesa/drivers/dri/r300/r300_context.h +++ b/src/mesa/drivers/dri/r300/r300_context.h @@ -656,6 +656,16 @@ struct r300_swtcl_info { * Offset of the 3UB specular color data within a hardware (swtcl) vertex. */ GLuint specoffset; + + struct vertex_attribute{ + GLuint attr; + GLubyte format; + GLubyte dst_loc; + GLuint swizzle; + GLubyte write_mask; + } vert_attrs[VERT_ATTRIB_MAX]; + + GLubyte vertex_attr_count; }; @@ -678,17 +688,10 @@ struct r300_context { GLboolean disable_lowimpact_fallback; - DECLARE_RENDERINPUTS(tnl_index_bitset); /* index of bits for last tnl_install_attrs */ - struct r300_swtcl_info swtcl; GLboolean vap_flush_needed; }; -struct r300_buffer_object { - struct gl_buffer_object mesa_obj; - int id; -}; - #define R300_CONTEXT(ctx) ((r300ContextPtr)(ctx->DriverCtx)) extern void r300DestroyContext(__DRIcontextPrivate * driContextPriv); -- cgit v1.2.3