mesa: move GL_INVALID_OPERATION error to rendering call

The validation api doesn't trigger this error so just move it to the
code called during rendering.

Reviewed-by: Tapani Pälli <[email protected]>
Cc: Kenneth Graunke <[email protected]>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index d6c14afe265..be983d4c86a 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -2034,9 +2034,10 @@ _mesa_valid_to_render(struct gl_context *ctx, const char *where)
 
    /* A pipeline object is bound */
    if (ctx->_Shader->Name && !ctx->_Shader->Validated) {
-      /* Error message will be printed inside _mesa_validate_program_pipeline.
-       */
-      if (!_mesa_validate_program_pipeline(ctx, ctx->_Shader, GL_TRUE)) {
+      if (!_mesa_validate_program_pipeline(ctx, ctx->_Shader)) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glValidateProgramPipeline failed to validate the "
+                     "pipeline");
          return GL_FALSE;
       }
    }