From patchwork Mon Feb 18 19:00:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 14968 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9F7BC23FD5 for ; Mon, 18 Feb 2013 19:02:50 +0000 (UTC) Received: from mail-vb0-f48.google.com (mail-vb0-f48.google.com [209.85.212.48]) by fiordland.canonical.com (Postfix) with ESMTP id 46B29A18831 for ; Mon, 18 Feb 2013 19:02:50 +0000 (UTC) Received: by mail-vb0-f48.google.com with SMTP id fc21so3701343vbb.21 for ; Mon, 18 Feb 2013 11:02:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=r21lMswzRlIZ8ll4h5te6BuZ9z/Px7OiFnfQZhoiLck=; b=Q1nnfEgyOo+vcMiP2Ld3JOhvYx2oi2fDNot4Av5TdgrGv3AQO6tCHvhkYAnvEsrc7A dLtkl+iiOX1ShW/LJHpDq6sOtq0YVNL9NoQDoCvn6RN4mgUtxK4WijKCF9Q8gJGtQRbI i1xewWy9Jtj5xsokq7UN/gPSQGjCFyWVyij4uxT7Ma0dMhJcvY4ai7zCUEa7/DZd0lPd lx86Mq+SxFEgvfV2P+OjFr/c5EEHRaHyvQqwS4rKOzDeSwMK7jSKba8HmWZaK7cv4z4A 83d2rMsoePnafOkj7RlihKVqQPikLSKrXn2jqsdoFFrIMF2VgtAlvdPi02r9NXPZnsGD Ekjw== X-Received: by 10.52.93.235 with SMTP id cx11mr14528010vdb.51.1361214169776; Mon, 18 Feb 2013 11:02:49 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp104861veb; Mon, 18 Feb 2013 11:02:49 -0800 (PST) X-Received: by 10.50.53.143 with SMTP id b15mr8104618igp.69.1361214168724; Mon, 18 Feb 2013 11:02:48 -0800 (PST) Received: from mail-ia0-x230.google.com (ia-in-x0230.1e100.net [2607:f8b0:4001:c02::230]) by mx.google.com with ESMTPS id i5si9796634igc.0.2013.02.18.11.02.48 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Feb 2013 11:02:48 -0800 (PST) Received-SPF: neutral (google.com: 2607:f8b0:4001:c02::230 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4001:c02::230; Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:4001:c02::230 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) smtp.mail=tom.gall@linaro.org Received: by mail-ia0-f176.google.com with SMTP id i18so5282697iac.7 for ; Mon, 18 Feb 2013 11:02:48 -0800 (PST) X-Received: by 10.50.153.165 with SMTP id vh5mr7137968igb.48.1361214168172; Mon, 18 Feb 2013 11:02:48 -0800 (PST) Received: from localhost.localdomain ([70.35.96.184]) by mx.google.com with ESMTPS id fa6sm10574907igb.2.2013.02.18.11.02.45 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 18 Feb 2013 11:02:46 -0800 (PST) From: Tom Gall To: piglit@lists.freedesktop.org Cc: patches@linaro.org, Tom Gall Subject: [PATCH 1/1] glslparsertest: On GLES don't require GL_ARB_ES2_compatibility Date: Mon, 18 Feb 2013 13:00:44 -0600 Message-Id: <1361214044-6301-1-git-send-email-tom.gall@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQk7Z6S3R6XR1a0pxmPhbW9MBQ5cndMQTggcLUW48rEW6PsLsWQtUGGseO8TIHbbA7ebavza glslparsertest.c has a bug where it assumes that when the requested glsl version is 1.00 the GL_ARB_ES2_compatibility extension must be present. For GLES2 this should not be required. The piglit_is_gles() call checks the version string from glGetString(GL_VERSION). Signed-off-by: Tom Gall --- tests/glslparsertest/glslparsertest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/glslparsertest/glslparsertest.c b/tests/glslparsertest/glslparsertest.c index 1fd75d1..6e638da 100644 --- a/tests/glslparsertest/glslparsertest.c +++ b/tests/glslparsertest/glslparsertest.c @@ -385,7 +385,7 @@ piglit_init(int argc, char**argv) if (glsl_version_string != NULL) glsl_version = parse_glsl_version(glsl_version_string); - if (requested_version == 100) { + if (requested_version == 100 && !piglit_is_gles()) { piglit_require_extension("GL_ARB_ES2_compatibility"); } else if (requested_version == 300) { piglit_require_extension("GL_ARB_ES3_compatibility");