Mesa (master): vbo: call _mesa_valid_to_render()
Brian Paul
brianp at kemper.freedesktop.org
Fri Aug 14 17:31:39 UTC 2009
Module: Mesa
Branch: master
Commit: d03dde16ebb5ab7f109c8ff6d710d54d50d4fa8f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d03dde16ebb5ab7f109c8ff6d710d54d50d4fa8f
Author: Brian Paul <brianp at vmware.com>
Date: Fri Aug 14 10:46:04 2009 -0600
vbo: call _mesa_valid_to_render()
---
src/mesa/vbo/vbo_exec_api.c | 21 +--------------------
1 files changed, 1 insertions(+), 20 deletions(-)
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index b746a77..387d4ee 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -486,23 +486,6 @@ static void GLAPIENTRY vbo_exec_EvalPoint2( GLint i, GLint j )
}
-/**
- * Check if programs/shaders are enabled and valid at glBegin time.
- */
-GLboolean
-vbo_validate_shaders(GLcontext *ctx)
-{
- if ((ctx->VertexProgram.Enabled && !ctx->VertexProgram._Enabled) ||
- (ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled)) {
- return GL_FALSE;
- }
- if (ctx->Shader.CurrentProgram && !ctx->Shader.CurrentProgram->LinkStatus) {
- return GL_FALSE;
- }
- return GL_TRUE;
-}
-
-
/* Build a list of primitives on the fly. Keep
* ctx->Driver.CurrentExecPrimitive uptodate as well.
*/
@@ -521,9 +504,7 @@ static void GLAPIENTRY vbo_exec_Begin( GLenum mode )
return;
}
- if (!vbo_validate_shaders(ctx)) {
- _mesa_error(ctx, GL_INVALID_OPERATION,
- "glBegin (invalid vertex/fragment program)");
+ if (!_mesa_valid_to_render(ctx, "glBegin")) {
return;
}
More information about the mesa-commit
mailing list