diff options
| author | Christian König <[email protected]> | 2010-10-28 20:24:56 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-10-28 20:24:56 +0200 |
| commit | 41ed47d6b8fb6c032e2907ef2e49e414c26f35c1 (patch) | |
| tree | 8cf267ee3ac5d8b530dd70a28a0d568344aa8304 /src/mesa/main/blend.c | |
| parent | 97a7cf230a70c64fff300931ae7c00aa00449c97 (diff) | |
| parent | 5479fa34d9acebd55f68c23a278cf382d0e84248 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video
Conflicts:
src/gallium/include/pipe/p_format.h
Diffstat (limited to 'src/mesa/main/blend.c')
| -rw-r--r-- | src/mesa/main/blend.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c index 736a94c052a..ec778b7244d 100644 --- a/src/mesa/main/blend.c +++ b/src/mesa/main/blend.c @@ -207,7 +207,7 @@ _mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB, #if _HAVE_FULL_GL static GLboolean -_mesa_validate_blend_equation( GLcontext *ctx, +_mesa_validate_blend_equation( struct gl_context *ctx, GLenum mode, GLboolean is_separate ) { switch (mode) { @@ -589,9 +589,9 @@ _mesa_ClampColorARB(GLenum target, GLenum clamp) * \param ctx GL context. * * Initializes the related fields in the context color attribute group, - * __GLcontextRec::Color. + * __struct gl_contextRec::Color. */ -void _mesa_init_color( GLcontext * ctx ) +void _mesa_init_color( struct gl_context * ctx ) { /* Color buffer group */ ctx->Color.IndexMask = ~0u; |