From f9995b30756140724f41daf963fa06167912be7f Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Tue, 12 Oct 2010 12:26:10 -0400 Subject: Drop GLcontext typedef and use struct gl_context instead --- src/mesa/swrast_setup/NOTES | 12 ++++++------ src/mesa/swrast_setup/ss_context.c | 18 +++++++++--------- src/mesa/swrast_setup/ss_triangle.c | 16 ++++++++-------- src/mesa/swrast_setup/ss_triangle.h | 4 ++-- src/mesa/swrast_setup/ss_tritmp.h | 4 ++-- src/mesa/swrast_setup/ss_vb.h | 4 ++-- src/mesa/swrast_setup/swrast_setup.h | 10 +++++----- 7 files changed, 34 insertions(+), 34 deletions(-) (limited to 'src/mesa/swrast_setup') diff --git a/src/mesa/swrast_setup/NOTES b/src/mesa/swrast_setup/NOTES index c6cb4ab3484..bdf57c39ef8 100644 --- a/src/mesa/swrast_setup/NOTES +++ b/src/mesa/swrast_setup/NOTES @@ -28,15 +28,15 @@ STATE To create and destroy the module: - GLboolean _swsetup_CreateContext( GLcontext *ctx ); - void _swsetup_DestroyContext( GLcontext *ctx ); + GLboolean _swsetup_CreateContext( struct gl_context *ctx ); + void _swsetup_DestroyContext( struct gl_context *ctx ); The module is not active by default, and must be installed by calling _swrast_Wakeup(). This function installs internal swrast_setup functions into all the tnl->Driver.Render driver hooks, thus taking over the task of rasterization entirely: - void _swrast_Wakeup( GLcontext *ctx ); + void _swrast_Wakeup( struct gl_context *ctx ); This module tracks state changes internally and maintains derived @@ -44,7 +44,7 @@ values based on the current state. For this to work, the driver ensure the following funciton is called whenever the state changes and the swsetup module is 'awake': - void _swsetup_InvalidateState( GLcontext *ctx, GLuint new_state ); + void _swsetup_InvalidateState( struct gl_context *ctx, GLuint new_state ); There is no explicit call to put the swsetup module to sleep. Simply install other function pointers into all the tnl->Driver.Render.* @@ -54,8 +54,8 @@ DRIVER INTERFACE The module offers a minimal driver interface: - void (*Start)( GLcontext *ctx ); - void (*Finish)( GLcontext *ctx ); + void (*Start)( struct gl_context *ctx ); + void (*Finish)( struct gl_context *ctx ); These are called before and after the completion of all swrast drawing activity. As swrast doesn't call callbacks during triangle, line or diff --git a/src/mesa/swrast_setup/ss_context.c b/src/mesa/swrast_setup/ss_context.c index 0fcb7c77af0..5da2e1eabee 100644 --- a/src/mesa/swrast_setup/ss_context.c +++ b/src/mesa/swrast_setup/ss_context.c @@ -47,7 +47,7 @@ GLboolean -_swsetup_CreateContext( GLcontext *ctx ) +_swsetup_CreateContext( struct gl_context *ctx ) { SScontext *swsetup = (SScontext *)CALLOC(sizeof(SScontext)); @@ -67,7 +67,7 @@ _swsetup_CreateContext( GLcontext *ctx ) } void -_swsetup_DestroyContext( GLcontext *ctx ) +_swsetup_DestroyContext( struct gl_context *ctx ) { SScontext *swsetup = SWSETUP_CONTEXT(ctx); @@ -80,7 +80,7 @@ _swsetup_DestroyContext( GLcontext *ctx ) } static void -_swsetup_RenderPrimitive( GLcontext *ctx, GLenum mode ) +_swsetup_RenderPrimitive( struct gl_context *ctx, GLenum mode ) { SWSETUP_CONTEXT(ctx)->render_prim = mode; _swrast_render_primitive( ctx, mode ); @@ -108,7 +108,7 @@ do { \ * _tnl_install_attrs(). */ static void -setup_vertex_format(GLcontext *ctx) +setup_vertex_format(struct gl_context *ctx) { TNLcontext *tnl = TNL_CONTEXT(ctx); SScontext *swsetup = SWSETUP_CONTEXT(ctx); @@ -184,7 +184,7 @@ setup_vertex_format(GLcontext *ctx) * Called via tnl->Driver.Render.Start. */ static void -_swsetup_RenderStart( GLcontext *ctx ) +_swsetup_RenderStart( struct gl_context *ctx ) { SScontext *swsetup = SWSETUP_CONTEXT(ctx); TNLcontext *tnl = TNL_CONTEXT(ctx); @@ -217,13 +217,13 @@ _swsetup_RenderStart( GLcontext *ctx ) * It's called when we finish rendering a vertex buffer. */ static void -_swsetup_RenderFinish( GLcontext *ctx ) +_swsetup_RenderFinish( struct gl_context *ctx ) { _swrast_render_finish( ctx ); } void -_swsetup_InvalidateState( GLcontext *ctx, GLuint new_state ) +_swsetup_InvalidateState( struct gl_context *ctx, GLuint new_state ) { SScontext *swsetup = SWSETUP_CONTEXT(ctx); swsetup->NewState |= new_state; @@ -232,7 +232,7 @@ _swsetup_InvalidateState( GLcontext *ctx, GLuint new_state ) void -_swsetup_Wakeup( GLcontext *ctx ) +_swsetup_Wakeup( struct gl_context *ctx ) { TNLcontext *tnl = TNL_CONTEXT(ctx); SScontext *swsetup = SWSETUP_CONTEXT(ctx); @@ -267,7 +267,7 @@ _swsetup_Wakeup( GLcontext *ctx ) * Populate a swrast SWvertex from an attrib-style vertex. */ void -_swsetup_Translate( GLcontext *ctx, const void *vertex, SWvertex *dest ) +_swsetup_Translate( struct gl_context *ctx, const void *vertex, SWvertex *dest ) { const GLfloat *m = ctx->Viewport._WindowMap.m; GLfloat tmp[4]; diff --git a/src/mesa/swrast_setup/ss_triangle.c b/src/mesa/swrast_setup/ss_triangle.c index f22bc52f0a8..5d1c70e9481 100644 --- a/src/mesa/swrast_setup/ss_triangle.c +++ b/src/mesa/swrast_setup/ss_triangle.c @@ -47,7 +47,7 @@ static tnl_quad_func quad_tab[SS_MAX_TRIFUNC]; /* * Render a triangle respecting edge flags. */ -typedef void (* swsetup_edge_render_prim_tri)(GLcontext *ctx, +typedef void (* swsetup_edge_render_prim_tri)(struct gl_context *ctx, const GLubyte *ef, GLuint e0, GLuint e1, @@ -60,7 +60,7 @@ typedef void (* swsetup_edge_render_prim_tri)(GLcontext *ctx, * Render a triangle using lines and respecting edge flags. */ static void -_swsetup_edge_render_line_tri(GLcontext *ctx, +_swsetup_edge_render_line_tri(struct gl_context *ctx, const GLubyte *ef, GLuint e0, GLuint e1, @@ -86,7 +86,7 @@ _swsetup_edge_render_line_tri(GLcontext *ctx, * Render a triangle using points and respecting edge flags. */ static void -_swsetup_edge_render_point_tri(GLcontext *ctx, +_swsetup_edge_render_point_tri(struct gl_context *ctx, const GLubyte *ef, GLuint e0, GLuint e1, @@ -105,7 +105,7 @@ _swsetup_edge_render_point_tri(GLcontext *ctx, /* * Render a triangle respecting cull and shade model. */ -static void _swsetup_render_tri(GLcontext *ctx, +static void _swsetup_render_tri(struct gl_context *ctx, GLuint e0, GLuint e1, GLuint e2, @@ -195,7 +195,7 @@ static void _swsetup_render_tri(GLcontext *ctx, #include "ss_tritmp.h" -void _swsetup_trifuncs_init( GLcontext *ctx ) +void _swsetup_trifuncs_init( struct gl_context *ctx ) { (void) ctx; @@ -210,7 +210,7 @@ void _swsetup_trifuncs_init( GLcontext *ctx ) } -static void swsetup_points( GLcontext *ctx, GLuint first, GLuint last ) +static void swsetup_points( struct gl_context *ctx, GLuint first, GLuint last ) { struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; SWvertex *verts = SWSETUP_CONTEXT(ctx)->verts; @@ -228,7 +228,7 @@ static void swsetup_points( GLcontext *ctx, GLuint first, GLuint last ) } } -static void swsetup_line( GLcontext *ctx, GLuint v0, GLuint v1 ) +static void swsetup_line( struct gl_context *ctx, GLuint v0, GLuint v1 ) { SWvertex *verts = SWSETUP_CONTEXT(ctx)->verts; _swrast_Line( ctx, &verts[v0], &verts[v1] ); @@ -236,7 +236,7 @@ static void swsetup_line( GLcontext *ctx, GLuint v0, GLuint v1 ) -void _swsetup_choose_trifuncs( GLcontext *ctx ) +void _swsetup_choose_trifuncs( struct gl_context *ctx ) { TNLcontext *tnl = TNL_CONTEXT(ctx); GLuint ind = 0; diff --git a/src/mesa/swrast_setup/ss_triangle.h b/src/mesa/swrast_setup/ss_triangle.h index ac553cbd018..05110865daf 100644 --- a/src/mesa/swrast_setup/ss_triangle.h +++ b/src/mesa/swrast_setup/ss_triangle.h @@ -32,7 +32,7 @@ #include "main/mtypes.h" -void _swsetup_trifuncs_init( GLcontext *ctx ); -void _swsetup_choose_trifuncs( GLcontext *ctx ); +void _swsetup_trifuncs_init( struct gl_context *ctx ); +void _swsetup_choose_trifuncs( struct gl_context *ctx ); #endif diff --git a/src/mesa/swrast_setup/ss_tritmp.h b/src/mesa/swrast_setup/ss_tritmp.h index 8e9fa1bd559..5844ad594cd 100644 --- a/src/mesa/swrast_setup/ss_tritmp.h +++ b/src/mesa/swrast_setup/ss_tritmp.h @@ -30,7 +30,7 @@ * This is where we handle assigning vertex colors based on front/back * facing, compute polygon offset and handle glPolygonMode(). */ -static void TAG(triangle)(GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 ) +static void TAG(triangle)(struct gl_context *ctx, GLuint e0, GLuint e1, GLuint e2 ) { struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; SScontext *swsetup = SWSETUP_CONTEXT(ctx); @@ -213,7 +213,7 @@ static void TAG(triangle)(GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 ) /* Need to fixup edgeflags when decomposing to triangles: */ -static void TAG(quadfunc)( GLcontext *ctx, GLuint v0, +static void TAG(quadfunc)( struct gl_context *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint v3 ) { if (IND & SS_UNFILLED_BIT) { diff --git a/src/mesa/swrast_setup/ss_vb.h b/src/mesa/swrast_setup/ss_vb.h index 944a3b78d8c..b8322f35a3d 100644 --- a/src/mesa/swrast_setup/ss_vb.h +++ b/src/mesa/swrast_setup/ss_vb.h @@ -31,7 +31,7 @@ #include "main/mtypes.h" -void _swsetup_vb_init( GLcontext *ctx ); -void _swsetup_choose_rastersetup_func( GLcontext *ctx ); +void _swsetup_vb_init( struct gl_context *ctx ); +void _swsetup_choose_rastersetup_func( struct gl_context *ctx ); #endif diff --git a/src/mesa/swrast_setup/swrast_setup.h b/src/mesa/swrast_setup/swrast_setup.h index 5dcbe2675b4..1d87ec1082d 100644 --- a/src/mesa/swrast_setup/swrast_setup.h +++ b/src/mesa/swrast_setup/swrast_setup.h @@ -41,21 +41,21 @@ #include "swrast/swrast.h" extern GLboolean -_swsetup_CreateContext( GLcontext *ctx ); +_swsetup_CreateContext( struct gl_context *ctx ); extern void -_swsetup_DestroyContext( GLcontext *ctx ); +_swsetup_DestroyContext( struct gl_context *ctx ); extern void -_swsetup_InvalidateState( GLcontext *ctx, GLuint new_state ); +_swsetup_InvalidateState( struct gl_context *ctx, GLuint new_state ); extern void -_swsetup_Wakeup( GLcontext *ctx ); +_swsetup_Wakeup( struct gl_context *ctx ); /* Helper function to translate a hardware vertex (as understood by * the tnl/t_vertex.c code) to a swrast vertex. */ extern void -_swsetup_Translate( GLcontext *ctx, const void *vertex, SWvertex *dest ); +_swsetup_Translate( struct gl_context *ctx, const void *vertex, SWvertex *dest ); #endif -- cgit v1.2.3