projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: support for GL_ARB_instanced_arrays
[mesa.git]
/
src
/
mesa
/
main
/
blend.c
diff --git
a/src/mesa/main/blend.c
b/src/mesa/main/blend.c
index de60031cc80d802992096de7ed04964ee812f642..ec778b7244dd8968f92aaf11248a14502db1a2e1 100644
(file)
--- 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
#if _HAVE_FULL_GL
static GLboolean
-_mesa_validate_blend_equation(
GL
context *ctx,
+_mesa_validate_blend_equation(
struct gl_
context *ctx,
GLenum mode, GLboolean is_separate )
{
switch (mode) {
GLenum mode, GLboolean is_separate )
{
switch (mode) {
@@
-215,8
+215,7
@@
_mesa_validate_blend_equation( GLcontext *ctx,
break;
case GL_MIN:
case GL_MAX:
break;
case GL_MIN:
case GL_MAX:
- if (!ctx->Extensions.EXT_blend_minmax &&
- !ctx->Extensions.ARB_imaging) {
+ if (!ctx->Extensions.EXT_blend_minmax) {
return GL_FALSE;
}
break;
return GL_FALSE;
}
break;
@@
-229,8
+228,7
@@
_mesa_validate_blend_equation( GLcontext *ctx,
break;
case GL_FUNC_SUBTRACT:
case GL_FUNC_REVERSE_SUBTRACT:
break;
case GL_FUNC_SUBTRACT:
case GL_FUNC_REVERSE_SUBTRACT:
- if (!ctx->Extensions.EXT_blend_subtract &&
- !ctx->Extensions.ARB_imaging) {
+ if (!ctx->Extensions.EXT_blend_subtract) {
return GL_FALSE;
}
break;
return GL_FALSE;
}
break;
@@
-456,9
+454,6
@@
_mesa_IndexMask( GLuint mask )
FLUSH_VERTICES(ctx, _NEW_COLOR);
ctx->Color.IndexMask = mask;
FLUSH_VERTICES(ctx, _NEW_COLOR);
ctx->Color.IndexMask = mask;
-
- if (ctx->Driver.IndexMask)
- ctx->Driver.IndexMask( ctx, mask );
}
#endif
}
#endif
@@
-594,9
+589,9
@@
_mesa_ClampColorARB(GLenum target, GLenum clamp)
* \param ctx GL context.
*
* Initializes the related fields in the context color attribute group,
* \param ctx GL context.
*
* Initializes the related fields in the context color attribute group,
- * __
GL
contextRec::Color.
+ * __
struct gl_
contextRec::Color.
*/
*/
-void _mesa_init_color(
GL
context * ctx )
+void _mesa_init_color(
struct gl_
context * ctx )
{
/* Color buffer group */
ctx->Color.IndexMask = ~0u;
{
/* Color buffer group */
ctx->Color.IndexMask = ~0u;