diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
| commit | 57b3e446b9b4017ccfdd3227be481df590740426 (patch) | |
| tree | 0e4899f530f75d343c090202fc7123c78f9b4866 /mesalib/src/mesa/main/blend.h | |
| parent | 24635abae6008bef13e30d798b3f33abab412770 (diff) | |
| parent | b3e1e62c45f525cdd332073aaa34d8452cb23374 (diff) | |
| download | vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.gz vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.bz2 vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update 19 nov 2012
Added bash script to update released branch
Conflicts:
mesalib/src/mapi/glapi/gen/gl_API.xml
mesalib/src/mesa/program/.gitignore
pixman/pixman/pixman-mmx.c
xorg-server/Xi/xiquerypointer.c
xorg-server/xkb/xkb.c
Diffstat (limited to 'mesalib/src/mesa/main/blend.h')
| -rw-r--r-- | mesalib/src/mesa/main/blend.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mesalib/src/mesa/main/blend.h b/mesalib/src/mesa/main/blend.h index d74f17ef1..a539aa809 100644 --- a/mesalib/src/mesa/main/blend.h +++ b/mesalib/src/mesa/main/blend.h @@ -43,16 +43,16 @@ _mesa_BlendFunc( GLenum sfactor, GLenum dfactor ); extern void GLAPIENTRY -_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB, +_mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorA, GLenum dfactorA ); extern void GLAPIENTRY -_mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor); +_mesa_BlendFunciARB(GLuint buf, GLenum sfactor, GLenum dfactor); extern void GLAPIENTRY -_mesa_BlendFuncSeparatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, +_mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorA, GLenum dfactorA); @@ -61,15 +61,15 @@ _mesa_BlendEquation( GLenum mode ); extern void GLAPIENTRY -_mesa_BlendEquationi(GLuint buf, GLenum mode); +_mesa_BlendEquationiARB(GLuint buf, GLenum mode); extern void GLAPIENTRY -_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA ); +_mesa_BlendEquationSeparate( GLenum modeRGB, GLenum modeA ); extern void GLAPIENTRY -_mesa_BlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeA); +_mesa_BlendEquationSeparateiARB(GLuint buf, GLenum modeRGB, GLenum modeA); extern void GLAPIENTRY @@ -92,12 +92,12 @@ _mesa_ColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha ); extern void GLAPIENTRY -_mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green, +_mesa_ColorMaski( GLuint buf, GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha ); extern void GLAPIENTRY -_mesa_ClampColorARB(GLenum target, GLenum clamp); +_mesa_ClampColor(GLenum target, GLenum clamp); extern void |