diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-04-09 13:42:55 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-04-09 13:42:55 +1000 |
| commit | 2a8de8ff94e0e0e52e03f8c8427a9e92fae374f4 (patch) | |
| tree | c13df91fcc114b297635eb4a254bab5578bc8239 /src/mesa/main/stencil.h | |
| parent | 2655f6901289bcfe3835cf28d7b9eefa242045b8 (diff) | |
| parent | 7e57a9e8bba322b2ba8a02eec4b79c90e7052738 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/main/stencil.h')
| -rw-r--r-- | src/mesa/main/stencil.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/main/stencil.h b/src/mesa/main/stencil.h index 27c6362023..252ac932ac 100644 --- a/src/mesa/main/stencil.h +++ b/src/mesa/main/stencil.h @@ -5,9 +5,9 @@ /* * Mesa 3-D graphics library - * Version: 6.5 + * Version: 7.1 * - * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -64,6 +64,9 @@ _mesa_StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask); extern void GLAPIENTRY +_mesa_StencilFuncSeparateATI(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); + +extern void GLAPIENTRY _mesa_StencilMaskSeparate(GLenum face, GLuint mask); |