From patchwork Fri Feb 15 17:35:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 14925 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 17C6323E1A for ; Fri, 15 Feb 2013 17:37:28 +0000 (UTC) Received: from mail-vb0-f48.google.com (mail-vb0-f48.google.com [209.85.212.48]) by fiordland.canonical.com (Postfix) with ESMTP id 909EDA196C5 for ; Fri, 15 Feb 2013 17:37:27 +0000 (UTC) Received: by mail-vb0-f48.google.com with SMTP id fc21so2273574vbb.21 for ; Fri, 15 Feb 2013 09:37:27 -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=eLlAFcp90nvzO41CATRg4/ERY21LbXovgnSRxPTzgnk=; b=UApj4PXYigaIS7yO5sRKBAMDoxiBbPJiynudr1fqsNl6saHrYkAlUz1D67zMS1evwF v8zvbzjj8bJJnEgDQMqZ0w7SjeiKsoJa0ifFGxcLhkxcwAqI275aDZy4aOYC9lOSnWmV 1rl47hI9b/z/DFXC11l6FBcuTHLBKGnIvSZw5fYOvrqmBbfD0PdNB+7dF1BATuC+DX1l Yr3byeTT0M9yO8QeVNzfdik5P4BB94y4z6WuPnWriRvz9h67KnPumGpNZh4aZ1YTwj51 2E8LarJRUGYi6fCgXihFAhUSYf/qiSpCioQCfRmlIuN9jR0EXBfIu3ynduA9QzixjQ35 tDkA== X-Received: by 10.221.0.79 with SMTP id nl15mr4315765vcb.41.1360949846995; Fri, 15 Feb 2013 09:37:26 -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 oa5csp27035vcb; Fri, 15 Feb 2013 09:37:26 -0800 (PST) X-Received: by 10.50.53.136 with SMTP id b8mr3206461igp.0.1360949845336; Fri, 15 Feb 2013 09:37:25 -0800 (PST) Received: from mail-ie0-x236.google.com (mail-ie0-x236.google.com [2607:f8b0:4001:c03::236]) by mx.google.com with ESMTPS id ce6si12004822icc.96.2013.02.15.09.37.24 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Feb 2013 09:37:25 -0800 (PST) Received-SPF: neutral (google.com: 2607:f8b0:4001:c03::236 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4001:c03::236; Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:4001:c03::236 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-f182.google.com with SMTP id k14so5144958iea.27 for ; Fri, 15 Feb 2013 09:37:24 -0800 (PST) X-Received: by 10.50.151.179 with SMTP id ur19mr3114925igb.79.1360949844710; Fri, 15 Feb 2013 09:37:24 -0800 (PST) Received: from localhost.localdomain ([70.35.96.184]) by mx.google.com with ESMTPS id qn10sm4429528igc.6.2013.02.15.09.37.21 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Feb 2013 09:37:22 -0800 (PST) From: Tom Gall To: piglit@lists.freedesktop.org Cc: patches@linaro.org, Tom Gall Subject: [PATCH 1/1] glsl-es-1.00: Move contents of glsl-1.00 to glsl-es-1.00 Date: Fri, 15 Feb 2013 11:35:50 -0600 Message-Id: <1360949750-30995-1-git-send-email-tom.gall@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQnIRiNzGMt+sWwwHQdf9nyrjMvLxtEOOsr9k7BuRezdFCgwkJ+XBBwa46ijAqdjBOzM6Atx Move contents of glsl-1.00 to the glsl-es-1.00 directory. Remove a few blank lines at the end of 4 tests so that git is happy. Last fix up all.tests so that all shader and glslparser tests for glsl-es-1.00 are listed and referenced in the new directory. V2: patch squashed and generated with --find-renames Signed-off-by: Tom Gall --- tests/all.tests | 11 +++++++---- .../compiler/arithmetic-operators/division-by-zero-01.frag | 1 - .../compiler/arithmetic-operators/division-by-zero-02.frag | 1 - .../compiler/arithmetic-operators/modulus-00.frag | 1 - .../assignment-operators/assign-array-prohibited.frag | 0 .../assignment-operators/assign-array-prohibited.vert | 0 .../compiler/assignment-operators/modulus-assign-00.frag | 1 - .../precision-qualifiers/default-precision-bool-01.frag | 0 .../precision-qualifiers/default-precision-float-01.frag | 0 .../precision-qualifiers/default-precision-int-01.frag | 0 .../precision-qualifiers/default-precision-sampler.frag | 0 .../precision-qualifiers/default-precision-sampler.vert | 0 .../precision-qualifiers/default-precision-vec-01.frag | 0 .../compiler/precision-qualifiers/precision-bool-01.frag | 0 .../compiler/precision-qualifiers/precision-bool-02.frag | 0 .../compiler/precision-qualifiers/precision-float-01.frag | 0 .../compiler/precision-qualifiers/precision-float-02.frag | 0 .../compiler/precision-qualifiers/precision-float-03.frag | 0 .../compiler/precision-qualifiers/precision-float-04.frag | 0 .../precision-qualifiers/precision-fs-highp-01.frag | 0 .../precision-qualifiers/precision-fs-highp-02.frag | 0 .../precision-qualifiers/precision-function-param-01.frag | 0 .../compiler/precision-qualifiers/precision-global-01.frag | 0 .../compiler/precision-qualifiers/precision-int-01.frag | 0 .../compiler/precision-qualifiers/precision-int-02.frag | 0 .../compiler/precision-qualifiers/precision-int-03.frag | 0 .../precision-qualifiers/precision-literal-const-01.frag | 0 .../precision-qualifiers/precision-literal-const-02.frag | 0 .../compiler/precision-qualifiers/precision-local-01.frag | 0 .../compiler/precision-qualifiers/precision-struct-01.frag | 0 .../compiler/precision-qualifiers/precision-struct-02.frag | 0 .../precision-qualifiers/precision-vs-highp-01.vert | 0 .../compiler/qualifiers/fn-inout-array-allowed-cstyle.frag | 0 .../compiler/qualifiers/fn-inout-array-allowed-cstyle.vert | 0 .../compiler/qualifiers/fn-out-array-allowed-cstyle.frag | 0 .../compiler/qualifiers/fn-out-array-allowed-cstyle.vert | 0 .../storage-qualfiers/static-write-attribute-01.vert | 0 .../storage-qualfiers/static-write-attribute-02.vert | 0 .../compiler/storage-qualfiers/static-write-varying-01.frag | 0 .../compiler/storage-qualfiers/static-write-varying-02.frag | 0 40 files changed, 7 insertions(+), 8 deletions(-) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/arithmetic-operators/division-by-zero-01.frag (99%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/arithmetic-operators/division-by-zero-02.frag (99%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/arithmetic-operators/modulus-00.frag (99%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/assignment-operators/assign-array-prohibited.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/assignment-operators/assign-array-prohibited.vert (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/assignment-operators/modulus-assign-00.frag (99%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/default-precision-bool-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/default-precision-float-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/default-precision-int-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/default-precision-sampler.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/default-precision-sampler.vert (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/default-precision-vec-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-bool-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-bool-02.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-float-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-float-02.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-float-03.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-float-04.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-fs-highp-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-fs-highp-02.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-function-param-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-global-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-int-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-int-02.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-int-03.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-literal-const-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-literal-const-02.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-local-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-struct-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-struct-02.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/precision-qualifiers/precision-vs-highp-01.vert (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/qualifiers/fn-out-array-allowed-cstyle.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/qualifiers/fn-out-array-allowed-cstyle.vert (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/storage-qualfiers/static-write-attribute-01.vert (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/storage-qualfiers/static-write-attribute-02.vert (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/storage-qualfiers/static-write-varying-01.frag (100%) rename tests/spec/{glsl-1.00 => glsl-es-1.00}/compiler/storage-qualfiers/static-write-varying-02.frag (100%) diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-bool-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-float-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-float-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-float-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-float-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-int-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-int-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-int-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-int-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-sampler.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-sampler.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-sampler.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-sampler.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-sampler.vert b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-sampler.vert similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-sampler.vert rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-sampler.vert diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/default-precision-vec-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-bool-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-bool-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-bool-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-02.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-bool-02.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-bool-02.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-02.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-02.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-02.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-03.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-03.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-03.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-03.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-04.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-04.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-float-04.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-float-04.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-fs-highp-02.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-function-param-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-function-param-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-function-param-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-function-param-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-global-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-global-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-global-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-global-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-02.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-02.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-02.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-03.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-03.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-int-03.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-int-03.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-literal-const-02.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-local-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-local-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-local-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-local-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-struct-01.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-01.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-struct-01.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-01.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-struct-02.frag b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-02.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-struct-02.frag rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-struct-02.frag diff --git a/tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert b/tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert similarity index 100% rename from tests/spec/glsl-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert rename to tests/spec/glsl-es-1.00/compiler/precision-qualifiers/precision-vs-highp-01.vert diff --git a/tests/spec/glsl-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 similarity index 100% rename from tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag rename to tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.frag diff --git a/tests/spec/glsl-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 similarity index 100% rename from tests/spec/glsl-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert rename to tests/spec/glsl-es-1.00/compiler/qualifiers/fn-inout-array-allowed-cstyle.vert diff --git a/tests/spec/glsl-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 similarity index 100% rename from tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag rename to tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.frag diff --git a/tests/spec/glsl-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 similarity index 100% rename from tests/spec/glsl-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert rename to tests/spec/glsl-es-1.00/compiler/qualifiers/fn-out-array-allowed-cstyle.vert diff --git a/tests/spec/glsl-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 similarity index 100% rename from tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert rename to tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-01.vert diff --git a/tests/spec/glsl-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 similarity index 100% rename from tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert rename to tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-attribute-02.vert diff --git a/tests/spec/glsl-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 similarity index 100% rename from tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-01.frag rename to tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-01.frag diff --git a/tests/spec/glsl-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 similarity index 100% rename from tests/spec/glsl-1.00/compiler/storage-qualfiers/static-write-varying-02.frag rename to tests/spec/glsl-es-1.00/compiler/storage-qualfiers/static-write-varying-02.frag diff --git a/tests/all.tests b/tests/all.tests index 4ce315f..3b8b83a 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -684,11 +684,14 @@ 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']) +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-es-1.00/compiler/arithmetic-operators/division-by-zero-01.frag similarity index 99% rename from tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-01.frag rename to tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-01.frag index a3dda0e..33094f7 100644 --- a/tests/spec/glsl-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 @@ -16,4 +16,3 @@ 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-es-1.00/compiler/arithmetic-operators/division-by-zero-02.frag similarity index 99% rename from tests/spec/glsl-1.00/compiler/arithmetic-operators/division-by-zero-02.frag rename to tests/spec/glsl-es-1.00/compiler/arithmetic-operators/division-by-zero-02.frag index a93ed7f..f195214 100644 --- a/tests/spec/glsl-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 @@ -16,4 +16,3 @@ 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-es-1.00/compiler/arithmetic-operators/modulus-00.frag similarity index 99% rename from tests/spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag rename to tests/spec/glsl-es-1.00/compiler/arithmetic-operators/modulus-00.frag index 8032e7a..1204c6f 100644 --- a/tests/spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag +++ b/tests/spec/glsl-es-1.00/compiler/arithmetic-operators/modulus-00.frag @@ -15,4 +15,3 @@ f() { int tea_time = 15 % 24; return tea_time; } - diff --git a/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.frag b/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.frag similarity index 100% rename from tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.frag rename to tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.frag diff --git a/tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.vert b/tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.vert similarity index 100% rename from tests/spec/glsl-1.00/compiler/assignment-operators/assign-array-prohibited.vert rename to tests/spec/glsl-es-1.00/compiler/assignment-operators/assign-array-prohibited.vert diff --git a/tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag b/tests/spec/glsl-es-1.00/compiler/assignment-operators/modulus-assign-00.frag similarity index 99% rename from tests/spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag rename to tests/spec/glsl-es-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-es-1.00/compiler/assignment-operators/modulus-assign-00.frag @@ -18,4 +18,3 @@ f() { x %= 4; return x; } -