From 6bec55a780b0e95445c6d77c6e35cc0c74290ac0 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 13 Jun 2016 09:59:10 -0700 Subject: [PATCH] mesa: If validation fails in a debug context just emit a debug message There are quite a few pipelines that desktop applications (including a bunch of piglit test) can expect to have run but don't meet the GLES requirements. Instead of failing validation, just emit a debug message. Signed-off-by: Ian Romanick Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96358 Cc: "12.0" Cc: Gregory Hainaut Reviewed-by: Ilia Mirkin Reviewed-by: Timothy Arceri --- src/mesa/main/pipelineobj.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c index 5a46cfe2dcd..9ecbcc9e9f6 100644 --- a/src/mesa/main/pipelineobj.c +++ b/src/mesa/main/pipelineobj.c @@ -929,8 +929,21 @@ _mesa_validate_program_pipeline(struct gl_context* ctx, * application has created a debug context. */ if ((_mesa_is_gles(ctx) || (ctx->Const.ContextFlags & GL_CONTEXT_FLAG_DEBUG_BIT)) && - !_mesa_validate_pipeline_io(pipe)) - return GL_FALSE; + !_mesa_validate_pipeline_io(pipe)) { + if (_mesa_is_gles(ctx)) + return GL_FALSE; + + static GLuint msg_id = 0; + + _mesa_gl_debug(ctx, &msg_id, + MESA_DEBUG_SOURCE_API, + MESA_DEBUG_TYPE_PORTABILITY, + MESA_DEBUG_SEVERITY_MEDIUM, + "glValidateProgramPipeline: pipeline %u does not meet " + "strict OpenGL ES 3.1 requirements and may not be " + "portable across desktop hardware\n", + pipe->Name); + } pipe->Validated = GL_TRUE; return GL_TRUE; -- 2.30.2