From patchwork Thu Feb 14 23:03:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 14805 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 5B0E923EAD for ; Thu, 14 Feb 2013 23:05:32 +0000 (UTC) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by fiordland.canonical.com (Postfix) with ESMTP id 10FA0A19217 for ; Thu, 14 Feb 2013 23:05:31 +0000 (UTC) Received: by mail-vc0-f173.google.com with SMTP id fy7so1864530vcb.32 for ; Thu, 14 Feb 2013 15:05:31 -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=66Rs1n+79ngJ9JK4awN3lrZQujJZ+aaVe4gjsn9BjA0=; b=EatK3g/78o51hjrWd/zV05XsCCP2bG2MSx1ZLKhpsOgg4f/Esr090of02Ve5q1F9/l oygj8Sj/0DzYUqJt71JS3RlXLwREHNsP1ejW1cYU+xw3+pq7LjsriNG7Z19aZAwN6uzJ aG5iORO9unTitFDVqVHgJhCOAuF87HXYLRr+LupNEXzvuLHeE5DfVAtu0REsXHuh9wNj jqb6RqxikqEcsMdLXNwDGxHP3piF2sYx1nStEp4am5jdlrvqypcQW8HiQAUSZMLKEuPl I31HRbM8GAlV+nU+EYJggRnIzviZltCyFkyfI0/hxHlgTHnK7lpJ0yQUaVRSPWLNFRf1 y0AQ== X-Received: by 10.52.38.163 with SMTP id h3mr550223vdk.35.1360883131530; Thu, 14 Feb 2013 15:05:31 -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 oa5csp290167vcb; Thu, 14 Feb 2013 15:05:30 -0800 (PST) X-Received: by 10.42.54.5 with SMTP id p5mr223217icg.49.1360883130323; Thu, 14 Feb 2013 15:05:30 -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 fk9si8961315icc.102.2013.02.14.15.05.30 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Feb 2013 15:05:30 -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 c13so3950777ieb.37 for ; Thu, 14 Feb 2013 15:05:30 -0800 (PST) X-Received: by 10.50.12.137 with SMTP id y9mr292321igb.57.1360883129894; Thu, 14 Feb 2013 15:05:29 -0800 (PST) Received: from localhost.localdomain ([70.35.96.184]) by mx.google.com with ESMTPS id a3sm856816igq.5.2013.02.14.15.05.27 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Feb 2013 15:05:28 -0800 (PST) From: Tom Gall To: piglit@lists.freedesktop.org Cc: patches@linaro.org, Tom Gall Subject: [PATCH 2/5] glsl-es-1.00: p2 move glsl-1.00 to glsl-es-1.00 Date: Thu, 14 Feb 2013 17:03:52 -0600 Message-Id: <1360883035-9981-2-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: ALoCoQnkLOSm811UkBHEjVArcwBzAJwiQM7XQLVDoXK3QZzSKiKbcHKpXdqc7QC7X9iLQfFpznqN Move contents of tests/spec/glsl-1.00/compiler/assignment-operators to tests/spec/glsl-es-1.00/compiler/assignment-operators Signed-off-by: Tom Gall --- .../assign-array-prohibited.frag | 19 ------------------- .../assign-array-prohibited.vert | 19 ------------------- .../assignment-operators/modulus-assign-00.frag | 20 -------------------- .../assign-array-prohibited.frag | 19 +++++++++++++++++++ .../assign-array-prohibited.vert | 19 +++++++++++++++++++ .../assignment-operators/modulus-assign-00.frag | 20 ++++++++++++++++++++ 6 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.frag delete mode 100644 tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.vert delete mode 100644 tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag create mode 100644 tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.frag create mode 100644 tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.vert create mode 100644 tests/spec/glsl-es-1.00/compiler/assignment-operators/modulus-assign-00.frag diff --git a/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.frag b/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.frag deleted file mode 100644 index d33f053..0000000 --- a/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.frag +++ /dev/null @@ -1,19 +0,0 @@ -// [config] -// expect_result: fail -// glsl_version: 1.00 -// [end config] -// -// Check that assignment to an array is illegal in GLSL ES 1.00. -// -// 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(float x[2]) -{ - float y[2]; - y = x; -} diff --git a/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.vert b/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.vert deleted file mode 100644 index d33f053..0000000 --- a/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.vert +++ /dev/null @@ -1,19 +0,0 @@ -// [config] -// expect_result: fail -// glsl_version: 1.00 -// [end config] -// -// Check that assignment to an array is illegal in GLSL ES 1.00. -// -// 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(float x[2]) -{ - float y[2]; - y = x; -} 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 deleted file mode 100644 index 7b35a9a..0000000 --- a/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag +++ /dev/null @@ -1,20 +0,0 @@ -// [config] -// expect_result: fail -// glsl_version: 1.00 -// [end config] -// -// The modulus assignment operator '%=' is reserved. -// -// From section 5.8 of the GLSL ES 1.00 spec: -// The assignments remainder into (%=), left shift by (<<=), right shift -// by (>>=), inclusive or into ( |=), and exclusive or into ( ^=) are -// reserved for future use. - -#version 100 - -int -f() { - int x = 19; - x %= 4; - return x; -} diff --git a/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.frag b/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.frag new file mode 100644 index 0000000..d33f053 --- /dev/null +++ b/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.frag @@ -0,0 +1,19 @@ +// [config] +// expect_result: fail +// glsl_version: 1.00 +// [end config] +// +// Check that assignment to an array is illegal in GLSL ES 1.00. +// +// 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(float x[2]) +{ + float y[2]; + y = x; +} diff --git a/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.vert b/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.vert new file mode 100644 index 0000000..d33f053 --- /dev/null +++ b/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.vert @@ -0,0 +1,19 @@ +// [config] +// expect_result: fail +// glsl_version: 1.00 +// [end config] +// +// Check that assignment to an array is illegal in GLSL ES 1.00. +// +// 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(float x[2]) +{ + float y[2]; + y = x; +} diff --git a/tests/spec/glsl-es-1.00/compiler/assignment-operators/modulus-assign-00.frag b/tests/spec/glsl-es-1.00/compiler/assignment-operators/modulus-assign-00.frag new file mode 100644 index 0000000..7b35a9a --- /dev/null +++ b/tests/spec/glsl-es-1.00/compiler/assignment-operators/modulus-assign-00.frag @@ -0,0 +1,20 @@ +// [config] +// expect_result: fail +// glsl_version: 1.00 +// [end config] +// +// The modulus assignment operator '%=' is reserved. +// +// From section 5.8 of the GLSL ES 1.00 spec: +// The assignments remainder into (%=), left shift by (<<=), right shift +// by (>>=), inclusive or into ( |=), and exclusive or into ( ^=) are +// reserved for future use. + +#version 100 + +int +f() { + int x = 19; + x %= 4; + return x; +}