From patchwork Thu Feb 14 23:03:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 14804 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 EE87123EAD for ; Thu, 14 Feb 2013 23:05:28 +0000 (UTC) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by fiordland.canonical.com (Postfix) with ESMTP id 814DEA18A28 for ; Thu, 14 Feb 2013 23:05:28 +0000 (UTC) Received: by mail-ve0-f169.google.com with SMTP id 15so2667357vea.0 for ; Thu, 14 Feb 2013 15:05:28 -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=BdgNGV6fXeSGyWLouXAWMWh30dJqtMi4XMC+vRFkswg=; b=bzp/wtsM9yuc4M98zCKXFgLJ/yScfQJkB1aPfRGcMikdwh0jB9Zeda039aLSZwqk4q TuvZ7IF+Gv92QVbFjdWlLJQRtUsTLo9xnm2J6WSpycjcFZCWCJp+Z6Kfcmiq2zHkLXBP y0MteMMXWqLbojaGTldtwbs4e1JrzFxYaJG1dyztFF3sBjR2SSyT38G/4wTVwERnbc+A RhnZTCqdhZgU315t71QmRGzFoMlh7+iCXqgQQVvXlD/xtqCOHB/fxMcRbxthi3gpCOat +2HgUjZDllFm1Qn5jCYGksL4BjJhMvDdgjzN90myCPKkpOiUHuBCAzvA6Tv7/xtuYtnn 2TxQ== X-Received: by 10.220.142.71 with SMTP id p7mr659880vcu.3.1360883127934; Thu, 14 Feb 2013 15:05:27 -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 oa5csp290165vcb; Thu, 14 Feb 2013 15:05:27 -0800 (PST) X-Received: by 10.50.151.166 with SMTP id ur6mr287703igb.66.1360883126990; Thu, 14 Feb 2013 15:05:26 -0800 (PST) Received: from mail-ia0-x22a.google.com (ia-in-x022a.1e100.net [2607:f8b0:4001:c02::22a]) by mx.google.com with ESMTPS id z6si9665108icv.49.2013.02.14.15.05.26 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Feb 2013 15:05:26 -0800 (PST) Received-SPF: neutral (google.com: 2607:f8b0:4001:c02::22a is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4001:c02::22a; Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:4001:c02::22a 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-f170.google.com with SMTP id k20so2798342iak.15 for ; Thu, 14 Feb 2013 15:05:26 -0800 (PST) X-Received: by 10.42.67.10 with SMTP id r10mr309133ici.7.1360883126314; Thu, 14 Feb 2013 15:05:26 -0800 (PST) Received: from localhost.localdomain ([70.35.96.184]) by mx.google.com with ESMTPS id a3sm856816igq.5.2013.02.14.15.05.24 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Feb 2013 15:05:25 -0800 (PST) From: Tom Gall To: piglit@lists.freedesktop.org Cc: patches@linaro.org, Tom Gall Subject: [PATCH 1/5] glsl-es-1.00: move contents of glsl-1.00 to glsl-es-1.00 Date: Thu, 14 Feb 2013 17:03:51 -0600 Message-Id: <1360883035-9981-1-git-send-email-tom.gall@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQkf4Jes15lRg0KOAz7kQwtgiRvxa0I1iPpE4RxfblkhYNaVCKUYNhuN8si9UY+xJ1UMYjew Change all.tests to reflect new location of glsl-1.00 to glsl-es-1.00 and add es as part of the group name. In all.tests, add glsl-es-1.00/execution as a shader test. Move contents of glsl-1.00/compiler/arithmetic-operators/ to glsl-es-1.00/compiler/arithmetic-operators. Remove blank line at end of tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag v2: switch to glsl-es-1.00 instead of glsl-1.00 based on list discussion Signed-off-by: Tom Gall --- tests/all.tests | 12 ++++++++---- .../arithmetic-operators/division-by-zero-01.frag | 19 ------------------- .../arithmetic-operators/division-by-zero-02.frag | 19 ------------------- .../compiler/arithmetic-operators/modulus-00.frag | 18 ------------------ .../assignment-operators/modulus-assign-00.frag | 1 - .../arithmetic-operators/division-by-zero-01.frag | 18 ++++++++++++++++++ .../arithmetic-operators/division-by-zero-02.frag | 18 ++++++++++++++++++ .../compiler/arithmetic-operators/modulus-00.frag | 17 +++++++++++++++++ 8 files changed, 61 insertions(+), 61 deletions(-) delete mode 100644 tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-01.frag delete mode 100644 tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-02.frag delete mode 100644 tests/spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag create mode 100644 tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-01.frag create mode 100644 tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-02.frag create mode 100644 tests/spec/glsl-es-1.00/compiler/arithmetic-operators/modulus-00.frag diff --git a/tests/all.tests b/tests/all.tests index f2229c6..074dd73 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -684,11 +684,15 @@ spec['!OpenGL 3.1'] = gl31 gl31['genned-names'] = concurrent_test('gl-3.1-genned-names') gl31['minmax'] = concurrent_test('gl-3.1-minmax') -# Group spec/glsl-1.00 -spec['glsl-1.00'] = Group() -import_glsl_parser_tests(spec['glsl-1.00'], - os.path.join(testsDir, 'spec', 'glsl-1.00'), +# Group spec/glsl-es-1.00 +spec['glsl-es-1.00'] = Group() +import_glsl_parser_tests(spec['glsl-es-1.00'], + os.path.join(testsDir, 'spec', 'glsl-es-1.00'), ['compiler']) +spec['glsl-es-1.00']['execution'] = Group() +add_shader_test_dir(spec['glsl-es-1.00']['execution'], + os.path.join(testsDir, 'spec', 'glsl-es-1.00', 'execution'), + recursive=True) # Group spec/glsl-1.10 spec['glsl-1.10'] = Group() diff --git a/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-01.frag b/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-01.frag deleted file mode 100644 index a3dda0e..0000000 --- a/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-01.frag +++ /dev/null @@ -1,19 +0,0 @@ -// [config] -// expect_result: pass -// glsl_version: 1.00 -// [end config] -// -// Division by zero is legal for floating point values. -// -// From section 5.9 of the GLSL ES 1.00 spec: -// Dividing by zero does not cause an exception but does result in an -// unspecified value. - -#version 100 - -float -f() { - float x = 1.0 / 0.0; - return x; -} - diff --git a/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-02.frag b/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-02.frag deleted file mode 100644 index a93ed7f..0000000 --- a/tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-02.frag +++ /dev/null @@ -1,19 +0,0 @@ -// [config] -// expect_result: pass -// glsl_version: 1.00 -// [end config] -// -// Division by zero is legal for integer values. -// -// From section 5.9 of the GLSL ES 1.00 spec: -// Dividing by zero does not cause an exception but does result in an -// unspecified value. - -#version 100 - -int -f() { - int x = 1 / 0; - return x; -} - diff --git a/tests/spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag b/tests/spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag deleted file mode 100644 index 8032e7a..0000000 --- a/tests/spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag +++ /dev/null @@ -1,18 +0,0 @@ -// [config] -// expect_result: fail -// glsl_version: 1.00 -// [end config] -// -// The modulus operator '%' is reserved. -// -// From section 5.9 of the GLSL ES 1.00 spec: -// The operator remainder (%) is reserved for future use. - -#version 100 - -int -f() { - int tea_time = 15 % 24; - return tea_time; -} - diff --git a/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag b/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag index c89e218..7b35a9a 100644 --- a/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag +++ b/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag @@ -18,4 +18,3 @@ f() { x %= 4; return x; } - diff --git a/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-01.frag b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-01.frag new file mode 100644 index 0000000..33094f7 --- /dev/null +++ b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-01.frag @@ -0,0 +1,18 @@ +// [config] +// expect_result: pass +// glsl_version: 1.00 +// [end config] +// +// Division by zero is legal for floating point values. +// +// From section 5.9 of the GLSL ES 1.00 spec: +// Dividing by zero does not cause an exception but does result in an +// unspecified value. + +#version 100 + +float +f() { + float x = 1.0 / 0.0; + return x; +} diff --git a/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-02.frag b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-02.frag new file mode 100644 index 0000000..f195214 --- /dev/null +++ b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-02.frag @@ -0,0 +1,18 @@ +// [config] +// expect_result: pass +// glsl_version: 1.00 +// [end config] +// +// Division by zero is legal for integer values. +// +// From section 5.9 of the GLSL ES 1.00 spec: +// Dividing by zero does not cause an exception but does result in an +// unspecified value. + +#version 100 + +int +f() { + int x = 1 / 0; + return x; +} diff --git a/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/modulus-00.frag b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/modulus-00.frag new file mode 100644 index 0000000..1204c6f --- /dev/null +++ b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/modulus-00.frag @@ -0,0 +1,17 @@ +// [config] +// expect_result: fail +// glsl_version: 1.00 +// [end config] +// +// The modulus operator '%' is reserved. +// +// From section 5.9 of the GLSL ES 1.00 spec: +// The operator remainder (%) is reserved for future use. + +#version 100 + +int +f() { + int tea_time = 15 % 24; + return tea_time; +}