diff --git a/configs/linux-debug b/configs/linux-debug diff --git a/src/mesa/drivers/dri/r200/r200_tcl.c b/src/mesa/drivers/dri/r200/r200_tcl.c index e0c32b2..1ff0cf9 100644 --- a/src/mesa/drivers/dri/r200/r200_tcl.c +++ b/src/mesa/drivers/dri/r200/r200_tcl.c @@ -489,7 +489,7 @@ static GLboolean r200_run_tcl_render( GL for (i = 0 ; i < VB->PrimitiveCount ; i++) { - GLuint prim = VB->Primitive[i].mode; + GLuint prim = _tnl_translate_prim(&VB->Primitive[i]); GLuint start = VB->Primitive[i].start; GLuint length = VB->Primitive[i].count; diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c index 3017c73..f96bb92 100644 --- a/src/mesa/tnl/t_context.c +++ b/src/mesa/tnl/t_context.c @@ -182,6 +182,14 @@ _tnl_wakeup( GLcontext *ctx ) #endif } +GLuint _tnl_translate_prim( const struct _mesa_prim *prim ) +{ + GLuint flag; + flag = prim->mode; + if (prim->begin) flag |= PRIM_BEGIN; + if (prim->end) flag |= PRIM_END; + return flag; +} diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h index 31b89ac..9cabf32 100644 --- a/src/mesa/tnl/t_context.h +++ b/src/mesa/tnl/t_context.h @@ -60,6 +60,9 @@ #define MAX_PIPELINE_STAGES 30 +GLuint _tnl_translate_prim( const struct _mesa_prim *prim ); + + /* * Note: The first attributes match the VERT_ATTRIB_* definitions * in mtypes.h. However, the tnl module has additional attributes @@ -174,17 +177,6 @@ enum { #define PRIM_END 0x20 #define PRIM_MODE_MASK 0x0f -static INLINE GLuint _tnl_translate_prim( const struct _mesa_prim *prim ) -{ - GLuint flag; - flag = prim->mode; - if (prim->begin) flag |= PRIM_BEGIN; - if (prim->end) flag |= PRIM_END; - return flag; -} - - - /** * Contains the current state of a running pipeline. diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h diff --git a/src/mesa/tnl_dd/t_dd_dmatmp2.h b/src/mesa/tnl_dd/t_dd_dmatmp2.h