From: Oliver McFadden Date: Sat, 26 May 2012 07:13:07 +0000 (+0300) Subject: mesa: don't compile integer clear shaders for unsupported APIs X-Git-Tag: android-x86-4.4-r1~5566 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ff3eef1affd0d3b56d4ce689947947be97c5d0f6;p=android-x86%2Fexternal-mesa.git mesa: don't compile integer clear shaders for unsupported APIs Discovered while running the Khronos conformance test suite and receiving "implementation error: meta program compile failed." This bug was recently introduced by the i965 clear patch set and would only be detected while using the ES2 API and only on gen6+ hardware. Signed-off-by: Oliver McFadden Reviewed-by: Brian Paul Reviewed-by: Eric Anholt Reviewed-by: Ian Romanick Reviewed-by: Kenneth Graunke --- diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 95336fc282b..a20e41972a2 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -1793,7 +1793,7 @@ meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear) clear->ColorLocation = _mesa_GetUniformLocationARB(clear->ShaderProg, "color"); - if (ctx->Const.GLSLVersion >= 130) { + if (ctx->API == API_OPENGL && ctx->Const.GLSLVersion >= 130) { vs = compile_shader_with_debug(ctx, GL_VERTEX_SHADER, vs_int_source); fs = compile_shader_with_debug(ctx, GL_FRAGMENT_SHADER, fs_int_source);