diff options
| author | Eric Anholt <eric@anholt.net> | 2008-06-24 14:08:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-06-24 14:08:08 -0700 |
| commit | f6abe8f0f2fba3073b58b96ed38aae163c765b4a (patch) | |
| tree | 706ba29d021fb1e4c54500e8773e3dda5f9ff6e8 /src/mesa/tnl_dd/t_dd_tritmp.h | |
| parent | a42dac187973cbc17be6c59db89264cbc935ab91 (diff) | |
| parent | 5174b85a0cb13b06779ea6fc0a8362c9fe57e2ea (diff) | |
Merge commit 'origin/master' into drm-gem
Diffstat (limited to 'src/mesa/tnl_dd/t_dd_tritmp.h')
| -rw-r--r-- | src/mesa/tnl_dd/t_dd_tritmp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/tnl_dd/t_dd_tritmp.h b/src/mesa/tnl_dd/t_dd_tritmp.h index 6c2378f5e8..2bb890593b 100644 --- a/src/mesa/tnl_dd/t_dd_tritmp.h +++ b/src/mesa/tnl_dd/t_dd_tritmp.h @@ -389,7 +389,7 @@ static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 ) #if DO_QUAD #if DO_FULL_QUAD -static void TAG(quad)( GLcontext *ctx, +static void TAG(quadr)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2, GLuint e3 ) { struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb; @@ -673,7 +673,7 @@ static void TAG(quad)( GLcontext *ctx, } } #else -static void TAG(quad)( GLcontext *ctx, GLuint e0, +static void TAG(quadr)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2, GLuint e3 ) { if (DO_UNFILLED) { @@ -765,7 +765,7 @@ static void TAG(points)( GLcontext *ctx, GLuint first, GLuint last ) static void TAG(init)( void ) { #if DO_QUAD - TAB[IND].quad = TAG(quad); + TAB[IND].quad = TAG(quadr); #endif #if DO_TRI TAB[IND].triangle = TAG(triangle); |