From 2571a768d6cacfbc7e434dfc2b6d01bdf5be21a6 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Tue, 24 Nov 2015 11:44:13 +1100 Subject: [PATCH] glsl: implement recent spec update to SSO validation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Enables 200+ dEQP SSO tests to proceed past validation, and fixes a ES31-CTS.sepshaderobjs.PipelineApi subtest. V2: split out change that reverts a previous patch into its own commit, move variable declaration to top of function, and fix some formatting all suggested by Ian. Reviewed-by: Ian Romanick Reviewed-by: Tapani Pälli Cc: "11.1" --- src/mesa/main/pipelineobj.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c index f079c508b1d..04391293919 100644 --- a/src/mesa/main/pipelineobj.c +++ b/src/mesa/main/pipelineobj.c @@ -761,6 +761,7 @@ _mesa_validate_program_pipeline(struct gl_context* ctx, GLboolean IsBound) { unsigned i; + bool program_empty = true; pipe->Validated = GL_FALSE; @@ -857,6 +858,29 @@ _mesa_validate_program_pipeline(struct gl_context* ctx, } } + /* Section 11.1.3.11 (Validation) of the OpenGL 4.5 spec says: + * + * "An INVALID_OPERATION error is generated by any command that trans- + * fers vertices to the GL or launches compute work if the current set + * of active program objects cannot be executed, for reasons including: + * + * ... + * + * - There is no current program object specified by UseProgram, + * there is a current program pipeline object, and that object is + * empty (no executable code is installed for any stage). + */ + for (i = 0; i < MESA_SHADER_STAGES; i++) { + if (pipe->CurrentProgram[i]) { + program_empty = false; + break; + } + } + + if (program_empty) { + goto err; + } + /* Section 2.11.11 (Shader Execution), subheading "Validation," of the * OpenGL 4.1 spec says: * -- 2.30.2