From patchwork Thu Feb 14 23:03:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 14808 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 88C5523EAD for ; Thu, 14 Feb 2013 23:05:40 +0000 (UTC) Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by fiordland.canonical.com (Postfix) with ESMTP id 29392A19217 for ; Thu, 14 Feb 2013 23:05:40 +0000 (UTC) Received: by mail-vb0-f49.google.com with SMTP id s24so1823304vbi.36 for ; Thu, 14 Feb 2013 15:05:39 -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 :in-reply-to:references:x-gm-message-state; bh=aiyxdo9p09+yrKDQQi8KwiZ4YvF6mhAMBlBrit0aQ3k=; b=WYi+bL11rk2vLOJBWOjG62SR7mO5XEGl3k4njc7WppYKehhxfVSfTiRAzTCSZecv2w oJVsU/eoIJuvZGS5uf5Ci4kYJfv3FTPwv/hqil7PmvSXoT9hxiUFNTsV9G7WWEi/4N60 G17qtppL+jF6V5HTrychEwH1ALPjYdnsq9uDgIHuw912ZSql+IqYj9TybjQNzlyZvlLr d3AbNziwbNNOiBj0sFeOmKxOawtBLuRM6edjogZVXwDi/OxOqYsiibrfR2FRBujhHywT lVWD2ZPYlHw7PAEEYbVAKITK0k9xhLqxRJgh6zvsDZoCKnxuP6MS+zeDJO+exVxs3yj3 cJCg== X-Received: by 10.52.98.5 with SMTP id ee5mr430273vdb.102.1360883139596; Thu, 14 Feb 2013 15:05:39 -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 oa5csp290179vcb; Thu, 14 Feb 2013 15:05:39 -0800 (PST) X-Received: by 10.50.140.104 with SMTP id rf8mr1106590igb.21.1360883138811; Thu, 14 Feb 2013 15:05:38 -0800 (PST) Received: from mail-ia0-x232.google.com (mail-ia0-x232.google.com [2607:f8b0:4001:c02::232]) by mx.google.com with ESMTPS id uy6si9508416icb.91.2013.02.14.15.05.38 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Feb 2013 15:05:38 -0800 (PST) Received-SPF: neutral (google.com: 2607:f8b0:4001:c02::232 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4001:c02::232; Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:4001:c02::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-ia0-f178.google.com with SMTP id y26so2719211iab.37 for ; Thu, 14 Feb 2013 15:05:38 -0800 (PST) X-Received: by 10.50.140.104 with SMTP id rf8mr1106570igb.21.1360883138116; Thu, 14 Feb 2013 15:05:38 -0800 (PST) Received: from localhost.localdomain ([70.35.96.184]) by mx.google.com with ESMTPS id a3sm856816igq.5.2013.02.14.15.05.36 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Feb 2013 15:05:37 -0800 (PST) From: Tom Gall To: piglit@lists.freedesktop.org Cc: patches@linaro.org, Tom Gall Subject: [PATCH 5/5] glsl-es-1.00: p5 move glsl-1.00 to glsl-es-1.00 Date: Thu, 14 Feb 2013 17:03:55 -0600 Message-Id: <1360883035-9981-5-git-send-email-tom.gall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360883035-9981-1-git-send-email-tom.gall@linaro.org> References: <1360883035-9981-1-git-send-email-tom.gall@linaro.org> X-Gm-Message-State: ALoCoQlEg+ko5xk6SSZTNjytdZUd4/FyMYgj05a6C9+XAAgEipoJbKrJJ9VW6Pb9WyHNj7p8fWuf Move contents of tests/spec/glsl-1.00/compiler/storage-qualfiers to tests/spec/glsl-es-1.00/compiler/storage-qualfiers Signed-off-by: Tom Gall --- .../static-write-attribute-01.vert | 17 ----------------- .../static-write-attribute-02.vert | 20 -------------------- .../storage-qualfiers/static-write-varying-01.frag | 15 --------------- .../storage-qualfiers/static-write-varying-02.frag | 19 ------------------- .../static-write-attribute-01.vert | 17 +++++++++++++++++ .../static-write-attribute-02.vert | 20 ++++++++++++++++++++ .../storage-qualfiers/static-write-varying-01.frag | 15 +++++++++++++++ .../storage-qualfiers/static-write-varying-02.frag | 19 +++++++++++++++++++ 8 files changed, 71 insertions(+), 71 deletions(-) delete mode 100644 tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert delete mode 100644 tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert delete mode 100644 tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-01.frag delete mode 100644 tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-02.frag create mode 100644 tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert create mode 100644 tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert create mode 100644 tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-01.frag create mode 100644 tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-02.frag diff --git a/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert b/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert deleted file mode 100644 index 7547479..0000000 --- a/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert +++ /dev/null @@ -1,17 +0,0 @@ -// [config] -// expect_result: fail -// glsl_version: 1.00 -// [end config] -// -// From section 4.3.3 of the GLSL 1.00 spec: -// Attribute variables are read-only as far as the vertex shader is -// concerned. - -#version 100 - -attribute float x; - -float f() { - x = 0.0; - return x; -} diff --git a/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert b/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert deleted file mode 100644 index a972d34..0000000 --- a/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert +++ /dev/null @@ -1,20 +0,0 @@ -// [config] -// expect_result: fail -// glsl_version: 1.00 -// [end config] -// -// From section 4.3.3 of the GLSL 1.00 spec: -// Attribute variables are read-only as far as the vertex shader is -// concerned. - -#version 100 - -attribute float x; - -void f(out float y) { - y = 0.0; -} - -void g() { - f(x); -} diff --git a/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-01.frag b/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-01.frag deleted file mode 100644 index f61d29c..0000000 --- a/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-01.frag +++ /dev/null @@ -1,15 +0,0 @@ -// [config] -// expect_result: fail -// glsl_version: 1.00 -// [end config] -// -// From section 4.3.5 of the GLSL 1.00 spec: -// A fragment shader can not write to a varying variable. - -#version 100 - -varying float x; - -void g() { - x = 0.0; -} diff --git a/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-02.frag b/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-02.frag deleted file mode 100644 index e5548c5..0000000 --- a/tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-02.frag +++ /dev/null @@ -1,19 +0,0 @@ -// [config] -// expect_result: fail -// glsl_version: 1.00 -// [end config] -// -// From section 4.3.5 of the GLSL 1.00 spec: -// A fragment shader can not write to a varying variable. - -#version 100 - -varying float x; - -void f(out float y) { - y = 0.0; -} - -void g() { - f(x); -} diff --git a/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert b/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert new file mode 100644 index 0000000..7547479 --- /dev/null +++ b/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert @@ -0,0 +1,17 @@ +// [config] +// expect_result: fail +// glsl_version: 1.00 +// [end config] +// +// From section 4.3.3 of the GLSL 1.00 spec: +// Attribute variables are read-only as far as the vertex shader is +// concerned. + +#version 100 + +attribute float x; + +float f() { + x = 0.0; + return x; +} diff --git a/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert b/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert new file mode 100644 index 0000000..a972d34 --- /dev/null +++ b/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert @@ -0,0 +1,20 @@ +// [config] +// expect_result: fail +// glsl_version: 1.00 +// [end config] +// +// From section 4.3.3 of the GLSL 1.00 spec: +// Attribute variables are read-only as far as the vertex shader is +// concerned. + +#version 100 + +attribute float x; + +void f(out float y) { + y = 0.0; +} + +void g() { + f(x); +} diff --git a/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-01.frag b/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-01.frag new file mode 100644 index 0000000..f61d29c --- /dev/null +++ b/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-01.frag @@ -0,0 +1,15 @@ +// [config] +// expect_result: fail +// glsl_version: 1.00 +// [end config] +// +// From section 4.3.5 of the GLSL 1.00 spec: +// A fragment shader can not write to a varying variable. + +#version 100 + +varying float x; + +void g() { + x = 0.0; +} diff --git a/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-02.frag b/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-02.frag new file mode 100644 index 0000000..e5548c5 --- /dev/null +++ b/tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-02.frag @@ -0,0 +1,19 @@ +// [config] +// expect_result: fail +// glsl_version: 1.00 +// [end config] +// +// From section 4.3.5 of the GLSL 1.00 spec: +// A fragment shader can not write to a varying variable. + +#version 100 + +varying float x; + +void f(out float y) { + y = 0.0; +} + +void g() { + f(x); +}