From patchwork Thu Feb 14 16:49:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 14802 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 30D344C17E5 for ; Thu, 14 Feb 2013 16:51:14 +0000 (UTC) Received: from mail-vb0-f51.google.com (mail-vb0-f51.google.com [209.85.212.51]) by fiordland.canonical.com (Postfix) with ESMTP id C85FAA192D4 for ; Thu, 14 Feb 2013 16:51:13 +0000 (UTC) Received: by mail-vb0-f51.google.com with SMTP id fq11so1602729vbb.10 for ; Thu, 14 Feb 2013 08:51:13 -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=VUrEvyC3jf/wUq+BjwDqBNXvKFyCLVKmGHmAPW/902o=; b=OQXLIeXwRMaz0mlpLCKu4PzlX83xMRJDLnatUg4uW1DdDaGwNlLrPIebI/HTIteEYm ETqZrAt9l2nQ8YjsI/4c9telxwwc950XMSX4zkbFikA0X8PQiEJ+4YB196XF5wt7Z6ql Xg7ZPj4Z704AHe4iiGXRxguVifMX0nJO1U8SIHFonqyJ531uCreh1/OAatNRNteIGYkQ T61NRjbIH+0JESunB9chjSGziNem5Dsh8ePIC1YbmkMpeZSef9v7lEG+mK6l4eTGC7+v 88z/NK0tnO9m4zuw+ov+CvViZqNiz8GjXHmKBmNL+W1Em8u899EPQUvRNNhnyxXS6bpu rvUw== X-Received: by 10.58.186.241 with SMTP id fn17mr8375134vec.8.1360860673309; Thu, 14 Feb 2013 08:51:13 -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.221.4.5 with SMTP id oa5csp272012vcb; Thu, 14 Feb 2013 08:51:12 -0800 (PST) X-Received: by 10.50.222.232 with SMTP id qp8mr243788igc.25.1360860672460; Thu, 14 Feb 2013 08:51:12 -0800 (PST) Received: from mail-ie0-x232.google.com (ie-in-x0232.1e100.net [2607:f8b0:4001:c03::232]) by mx.google.com with ESMTPS id z2si221313igc.4.2013.02.14.08.51.12 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Feb 2013 08:51:12 -0800 (PST) Received-SPF: neutral (google.com: 2607:f8b0:4001:c03::232 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4001:c03::232; Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:4001:c03::232 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-ie0-f178.google.com with SMTP id c13so3481990ieb.23 for ; Thu, 14 Feb 2013 08:51:12 -0800 (PST) X-Received: by 10.50.182.234 with SMTP id eh10mr214591igc.40.1360860656953; Thu, 14 Feb 2013 08:50:56 -0800 (PST) Received: from localhost.localdomain ([70.35.96.184]) by mx.google.com with ESMTPS id vb15sm264504igb.9.2013.02.14.08.50.55 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Feb 2013 08:50:56 -0800 (PST) From: Tom Gall To: piglit@lists.freedesktop.org Cc: patches@linaro.org, Tom Gall Subject: [PATCH 1/1] glsl-1.00: move contents of glsl-es-1.00 to glsl-1.00 Date: Thu, 14 Feb 2013 10:49:24 -0600 Message-Id: <1360860564-8469-1-git-send-email-tom.gall@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQkkyQZQ9iVRHye86U4NNUerdNbBVNGC7Gn2BS+6XiZGwpnHZ6IEO/Fg6eqvMgvw3R5lEdhW Add glsl-1.00/execution dir to all.tests as a shader test. Move contents of glsl-es-1.00 to glsl-1.00 and remove glsl-es-1.00. Signed-off-by: Tom Gall --- tests/all.tests | 4 ++ tests/spec/glsl-1.00/execution/sanity.shader_test | 39 ++++++++++++++++++++ .../spec/glsl-es-1.00/execution/sanity.shader_test | 39 -------------------- 3 files changed, 43 insertions(+), 39 deletions(-) create mode 100644 tests/spec/glsl-1.00/execution/sanity.shader_test delete mode 100644 tests/spec/glsl-es-1.00/execution/sanity.shader_test diff --git a/tests/all.tests b/tests/all.tests index f2229c6..ed4643b 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -689,6 +689,10 @@ spec['glsl-1.00'] = Group() import_glsl_parser_tests(spec['glsl-1.00'], os.path.join(testsDir, 'spec', 'glsl-1.00'), ['compiler']) +spec['glsl-1.00']['execution'] = Group() +add_shader_test_dir(spec['glsl-1.00']['execution'], + os.path.join(testsDir, 'spec', 'glsl-1.00', 'execution'), + recursive=True) # Group spec/glsl-1.10 spec['glsl-1.10'] = Group() diff --git a/tests/spec/glsl-1.00/execution/sanity.shader_test b/tests/spec/glsl-1.00/execution/sanity.shader_test new file mode 100644 index 0000000..0884e2c --- /dev/null +++ b/tests/spec/glsl-1.00/execution/sanity.shader_test @@ -0,0 +1,39 @@ +# Fill the window with red, then green, then blue. + +[require] +GL ES >= 2.0 +GLSL ES >= 1.00 + +[vertex shader] +attribute vec4 vertex; + +void main() { + gl_Position = vertex; +} + +[fragment shader] +uniform vec4 u_color; + +void main() { + gl_FragColor = u_color; +} + +[vertex data] +vertex/float/2 +-1.0 -1.0 + 1.0 -1.0 + 1.0 1.0 +-1.0 1.0 + +[test] +uniform vec4 u_color 1.0 0.0 0.0 1.0 +draw arrays GL_TRIANGLE_FAN 0 4 +probe all rgba 1.0 0.0 0.0 1.0 + +uniform vec4 u_color 0.0 1.0 0.0 1.0 +draw arrays GL_TRIANGLE_FAN 0 4 +probe all rgba 0.0 1.0 0.0 1.0 + +uniform vec4 u_color 0.0 0.0 1.0 1.0 +draw arrays GL_TRIANGLE_FAN 0 4 +probe all rgba 0.0 0.0 1.0 1.0 diff --git a/tests/spec/glsl-es-1.00/execution/sanity.shader_test b/tests/spec/glsl-es-1.00/execution/sanity.shader_test deleted file mode 100644 index 0884e2c..0000000 --- a/tests/spec/glsl-es-1.00/execution/sanity.shader_test +++ /dev/null @@ -1,39 +0,0 @@ -# Fill the window with red, then green, then blue. - -[require] -GL ES >= 2.0 -GLSL ES >= 1.00 - -[vertex shader] -attribute vec4 vertex; - -void main() { - gl_Position = vertex; -} - -[fragment shader] -uniform vec4 u_color; - -void main() { - gl_FragColor = u_color; -} - -[vertex data] -vertex/float/2 --1.0 -1.0 - 1.0 -1.0 - 1.0 1.0 --1.0 1.0 - -[test] -uniform vec4 u_color 1.0 0.0 0.0 1.0 -draw arrays GL_TRIANGLE_FAN 0 4 -probe all rgba 1.0 0.0 0.0 1.0 - -uniform vec4 u_color 0.0 1.0 0.0 1.0 -draw arrays GL_TRIANGLE_FAN 0 4 -probe all rgba 0.0 1.0 0.0 1.0 - -uniform vec4 u_color 0.0 0.0 1.0 1.0 -draw arrays GL_TRIANGLE_FAN 0 4 -probe all rgba 0.0 0.0 1.0 1.0