From patchwork Thu Feb 14 23:03:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 14807 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 88FFF23EAD for ; Thu, 14 Feb 2013 23:05:37 +0000 (UTC) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by fiordland.canonical.com (Postfix) with ESMTP id 23B96A18A28 for ; Thu, 14 Feb 2013 23:05:37 +0000 (UTC) Received: by mail-vc0-f169.google.com with SMTP id n10so1888768vcn.28 for ; Thu, 14 Feb 2013 15:05:36 -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=FvDwSWb2bC9lB6VDSUUYjFiuu8rjQuNt0h7Z5jUlksg=; b=fu3FJzWKqXGN2zL0EOdriUTyP7ZOVOpz1wxrO7aAWZHF/C2EgDEeTK/V8PK1WDfhPI cJqCf+Y6cxVzTWrsDVfwkoVoU1ZoQKlaoUWTChF+4d57smUbYHgpvwcYrIidZhw2GRGP 5ZZn6lC1dvuMKM1/jsr5TGLQyXuR2BLLlxp+l67aflpxogYdxOdijxNh75Qp+Iqqt1U4 7Gz+XI4ZlMER2J8WKPcQp4cECV4PZzH5zvIOXzPYbK05HepcR2WDElWlGrHjBM+Jdd89 rxeBXxmRPQ7kG0vuKOQRcIxGeXOhvzYI+P/Epv3Lsy0uqeKKH3qd6Xv5Hsf2JJ9aoEBB 1TCw== X-Received: by 10.58.12.200 with SMTP id a8mr475095vec.52.1360883136629; Thu, 14 Feb 2013 15:05:36 -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 oa5csp290175vcb; Thu, 14 Feb 2013 15:05:36 -0800 (PST) X-Received: by 10.50.156.161 with SMTP id wf1mr277178igb.71.1360883135949; Thu, 14 Feb 2013 15:05:35 -0800 (PST) Received: from mail-ie0-x235.google.com (ie-in-x0235.1e100.net [2607:f8b0:4001:c03::235]) by mx.google.com with ESMTPS id pa2si1184839igc.2.2013.02.14.15.05.35 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Feb 2013 15:05:35 -0800 (PST) Received-SPF: neutral (google.com: 2607:f8b0:4001:c03::235 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4001:c03::235; Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:4001:c03::235 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-f181.google.com with SMTP id 17so3974769iea.26 for ; Thu, 14 Feb 2013 15:05:35 -0800 (PST) X-Received: by 10.50.42.202 with SMTP id q10mr241026igl.108.1360883135597; Thu, 14 Feb 2013 15:05:35 -0800 (PST) Received: from localhost.localdomain ([70.35.96.184]) by mx.google.com with ESMTPS id a3sm856816igq.5.2013.02.14.15.05.33 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Feb 2013 15:05:34 -0800 (PST) From: Tom Gall To: piglit@lists.freedesktop.org Cc: patches@linaro.org, Tom Gall Subject: [PATCH 4/5] glsl-es-1.00: p4 move glsl-1.00 to glsl-es-1.00 Date: Thu, 14 Feb 2013 17:03:54 -0600 Message-Id: <1360883035-9981-4-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: ALoCoQnX5rLitCDy4gArEgS80gTCWGSTMmNsvVBXB+JbNPX5mUbeN2390+QOt616Rtj7eZfhLA6q Move contents of tests/spec/glsl-1.00/compiler/qualifiers to tests/spec/glsl-es-1.00/compiler/qualifiers Signed-off-by: Tom Gall --- .../qualifiers/fn-inout-array-allowed-cstyle.frag | 28 ------------------- .../qualifiers/fn-inout-array-allowed-cstyle.vert | 29 -------------------- .../qualifiers/fn-out-array-allowed-cstyle.frag | 28 ------------------- .../qualifiers/fn-out-array-allowed-cstyle.vert | 29 -------------------- .../qualifiers/fn-inout-array-allowed-cstyle.frag | 28 +++++++++++++++++++ .../qualifiers/fn-inout-array-allowed-cstyle.vert | 29 ++++++++++++++++++++ .../qualifiers/fn-out-array-allowed-cstyle.frag | 28 +++++++++++++++++++ .../qualifiers/fn-out-array-allowed-cstyle.vert | 29 ++++++++++++++++++++ 8 files changed, 114 insertions(+), 114 deletions(-) delete mode 100644 tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag delete mode 100644 tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert delete mode 100644 tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag delete mode 100644 tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert create mode 100644 tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag create mode 100644 tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert create mode 100644 tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag create mode 100644 tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert diff --git a/tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag b/tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag deleted file mode 100644 index 497d275..0000000 --- a/tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag +++ /dev/null @@ -1,28 +0,0 @@ -// [config] -// expect_result: pass -// glsl_version: 1.00 -// check_link: true -// [end config] -// -// Check that an array can be used as a function inout parameter in -// GLSL ES 1.00. -// -// In this test, the array is declared using C-style array -// declaration syntax (float x[2] as opposed to float[2] x). -// -// From section 5.8 of the GLSL ES 1.00 spec: -// Array variables are l-values and may be passed to parameters -// declared as out or inout. However, they may not be used as the -// target of an assignment. - -#version 100 - -void f(inout float x[2]) -{ -} - -void main() -{ - float[2] x; - f(x); -} diff --git a/tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert b/tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert deleted file mode 100644 index af7075f..0000000 --- a/tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert +++ /dev/null @@ -1,29 +0,0 @@ -// [config] -// expect_result: pass -// glsl_version: 1.00 -// check_link: true -// [end config] -// -// Check that an array can be used as a function inout parameter in -// GLSL ES 1.00. -// -// In this test, the array is declared using C-style array -// declaration syntax (float x[2] as opposed to float[2] x). -// -// From section 5.8 of the GLSL ES 1.00 spec: -// Array variables are l-values and may be passed to parameters -// declared as out or inout. However, they may not be used as the -// target of an assignment. - -#version 100 - -void f(inout float x[2]) -{ -} - -void main() -{ - float[2] x; - f(x); - gl_Position = vec4(0.0); -} diff --git a/tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag b/tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag deleted file mode 100644 index 2dd38ab..0000000 --- a/tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag +++ /dev/null @@ -1,28 +0,0 @@ -// [config] -// expect_result: pass -// glsl_version: 1.00 -// check_link: true -// [end config] -// -// Check that an array can be used as a function out parameter in -// GLSL ES 1.00. -// -// In this test, the array is declared using C-style array -// declaration syntax (float x[2] as opposed to float[2] x). -// -// From section 5.8 of the GLSL ES 1.00 spec: -// Array variables are l-values and may be passed to parameters -// declared as out or inout. However, they may not be used as the -// target of an assignment. - -#version 100 - -void f(out float x[2]) -{ -} - -void main() -{ - float[2] x; - f(x); -} diff --git a/tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert b/tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert deleted file mode 100644 index 2f839ba..0000000 --- a/tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert +++ /dev/null @@ -1,29 +0,0 @@ -// [config] -// expect_result: pass -// glsl_version: 1.00 -// check_link: true -// [end config] -// -// Check that an array can be used as a function out parameter in -// GLSL 1.00. -// -// In this test, the array is declared using C-style array -// declaration syntax (float x[2] as opposed to float[2] x). -// -// From section 5.8 of the GLSL ES 1.00 spec: -// Array variables are l-values and may be passed to parameters -// declared as out or inout. However, they may not be used as the -// target of an assignment. - -#version 100 - -void f(out float x[2]) -{ -} - -void main() -{ - float[2] x; - f(x); - gl_Position = vec4(0.0); -} diff --git a/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag b/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag new file mode 100644 index 0000000..497d275 --- /dev/null +++ b/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag @@ -0,0 +1,28 @@ +// [config] +// expect_result: pass +// glsl_version: 1.00 +// check_link: true +// [end config] +// +// Check that an array can be used as a function inout parameter in +// GLSL ES 1.00. +// +// In this test, the array is declared using C-style array +// declaration syntax (float x[2] as opposed to float[2] x). +// +// From section 5.8 of the GLSL ES 1.00 spec: +// Array variables are l-values and may be passed to parameters +// declared as out or inout. However, they may not be used as the +// target of an assignment. + +#version 100 + +void f(inout float x[2]) +{ +} + +void main() +{ + float[2] x; + f(x); +} diff --git a/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert b/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert new file mode 100644 index 0000000..af7075f --- /dev/null +++ b/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert @@ -0,0 +1,29 @@ +// [config] +// expect_result: pass +// glsl_version: 1.00 +// check_link: true +// [end config] +// +// Check that an array can be used as a function inout parameter in +// GLSL ES 1.00. +// +// In this test, the array is declared using C-style array +// declaration syntax (float x[2] as opposed to float[2] x). +// +// From section 5.8 of the GLSL ES 1.00 spec: +// Array variables are l-values and may be passed to parameters +// declared as out or inout. However, they may not be used as the +// target of an assignment. + +#version 100 + +void f(inout float x[2]) +{ +} + +void main() +{ + float[2] x; + f(x); + gl_Position = vec4(0.0); +} diff --git a/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag b/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag new file mode 100644 index 0000000..2dd38ab --- /dev/null +++ b/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag @@ -0,0 +1,28 @@ +// [config] +// expect_result: pass +// glsl_version: 1.00 +// check_link: true +// [end config] +// +// Check that an array can be used as a function out parameter in +// GLSL ES 1.00. +// +// In this test, the array is declared using C-style array +// declaration syntax (float x[2] as opposed to float[2] x). +// +// From section 5.8 of the GLSL ES 1.00 spec: +// Array variables are l-values and may be passed to parameters +// declared as out or inout. However, they may not be used as the +// target of an assignment. + +#version 100 + +void f(out float x[2]) +{ +} + +void main() +{ + float[2] x; + f(x); +} diff --git a/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert b/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert new file mode 100644 index 0000000..2f839ba --- /dev/null +++ b/tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert @@ -0,0 +1,29 @@ +// [config] +// expect_result: pass +// glsl_version: 1.00 +// check_link: true +// [end config] +// +// Check that an array can be used as a function out parameter in +// GLSL 1.00. +// +// In this test, the array is declared using C-style array +// declaration syntax (float x[2] as opposed to float[2] x). +// +// From section 5.8 of the GLSL ES 1.00 spec: +// Array variables are l-values and may be passed to parameters +// declared as out or inout. However, they may not be used as the +// target of an assignment. + +#version 100 + +void f(out float x[2]) +{ +} + +void main() +{ + float[2] x; + f(x); + gl_Position = vec4(0.0); +}