summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2016-08-20 12:18:16 -0700
committerKenneth Graunke <[email protected]>2016-08-25 19:22:09 -0700
commit75ae338d14ee3bf3ba438bb406831bf10b2c2f5d (patch)
tree788f4662f9976a80329cacd424fab8f7be14e47f /src/mesa
parent0745e039a2a9d6763f9a1a241fba18bdbd74ad85 (diff)
mesa: Restyle _mesa_check_blend_func_error().
I'm about to add more error conditions to this function, so I wanted to move the current spec citation above the code that checks it. Indenting it required reformatting, so I tried to move it to our newer style. While there, I also decided to drop some GL type usage, and drop the unnecessary "_mesa_" prefix on a static function. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Francisco Jerez <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/context.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 574c0fb7cec..4ff0979c00b 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1855,28 +1855,28 @@ _mesa_Flush(void)
}
-/*
- * ARB_blend_func_extended - ERRORS section
- * "The error INVALID_OPERATION is generated by Begin or any procedure that
- * implicitly calls Begin if any draw buffer has a blend function requiring the
- * second color input (SRC1_COLOR, ONE_MINUS_SRC1_COLOR, SRC1_ALPHA or
- * ONE_MINUS_SRC1_ALPHA), and a framebuffer is bound that has more than
- * the value of MAX_DUAL_SOURCE_DRAW_BUFFERS-1 active color attachements."
- */
-static GLboolean
-_mesa_check_blend_func_error(struct gl_context *ctx)
+static bool
+check_blend_func_error(struct gl_context *ctx)
{
- GLuint i;
- for (i = ctx->Const.MaxDualSourceDrawBuffers;
+ /* The ARB_blend_func_extended spec's ERRORS section says:
+ *
+ * "The error INVALID_OPERATION is generated by Begin or any procedure
+ * that implicitly calls Begin if any draw buffer has a blend function
+ * requiring the second color input (SRC1_COLOR, ONE_MINUS_SRC1_COLOR,
+ * SRC1_ALPHA or ONE_MINUS_SRC1_ALPHA), and a framebuffer is bound that
+ * has more than the value of MAX_DUAL_SOURCE_DRAW_BUFFERS-1 active
+ * color attachements."
+ */
+ for (unsigned i = ctx->Const.MaxDualSourceDrawBuffers;
i < ctx->DrawBuffer->_NumColorDrawBuffers;
i++) {
if (ctx->Color.Blend[i]._UsesDualSrc) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"dual source blend on illegal attachment");
- return GL_FALSE;
+ return false;
}
}
- return GL_TRUE;
+ return true;
}
@@ -1951,7 +1951,7 @@ _mesa_valid_to_render(struct gl_context *ctx, const char *where)
return GL_FALSE;
}
- if (_mesa_check_blend_func_error(ctx) == GL_FALSE) {
+ if (!check_blend_func_error(ctx)) {
return GL_FALSE;
}