From patchwork Wed Apr 1 05:24:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 'Timothy Arceri' via Patchwork Forward X-Patchwork-Id: 46610 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 55C0B2159A for ; Wed, 1 Apr 2015 05:25:01 +0000 (UTC) Received: by layy10 with SMTP id y10sf1743131lay.0 for ; Tue, 31 Mar 2015 22:25:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:content-type:content-transfer-encoding:errors-to :sender:x-original-sender:x-original-authentication-results :mailing-list:reply-to; bh=Ncx+U9jyER6SVy75W610HCRXnthDoFFNgnS9w6eS2fY=; b=kFe3Vj+eg5cqvryfl2Gxf3g+t3n0F3XkWJ5AuVkohqKuWkcO8voOOBdaZIbbs9FNE+ 1XA1F/g2/uqtvvbgmOVJY03MmHK9BU+HYlSHmVjSC8pzIBzIXH+ztVA7CWwjKEItPqvG SasMTYT2PUzNveUcMzKYZua5NtvMzyQdGeUI+znyT6xy9kOR1dI/KsLk/VgjC0oAAZZw srpmhHfwE5PcJJ/AXuCk2YZy55J8t/udeCq6UCZiLGA5N0wvQq2J1zC240N8dYge/ulF tHbshQbccz0f69EAfsvOaIEtjlX8FVNF6BGd1QFuWiutJyif8vNmcqONw2eUkJ37WBKL pAXA== X-Gm-Message-State: ALoCoQm6yTiu6tyqYpZLTZaNcx/CiSZ5WGSIwqRTaX9/KFiqRbOxQupQCVCkcU9fAwUQWMe0ftrX X-Received: by 10.180.126.37 with SMTP id mv5mr1414713wib.3.1427865899985; Tue, 31 Mar 2015 22:24:59 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.106 with SMTP id w10ls23567laz.62.gmail; Tue, 31 Mar 2015 22:24:59 -0700 (PDT) X-Received: by 10.152.6.71 with SMTP id y7mr7390383lay.116.1427865899817; Tue, 31 Mar 2015 22:24:59 -0700 (PDT) Received: from mail-lb0-x232.google.com (mail-lb0-x232.google.com. [2a00:1450:4010:c04::232]) by mx.google.com with ESMTPS id o5si612557lao.144.2015.03.31.22.24.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Mar 2015 22:24:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::232 as permitted sender) client-ip=2a00:1450:4010:c04::232; Received: by lbdc10 with SMTP id c10so27888449lbd.2 for ; Tue, 31 Mar 2015 22:24:59 -0700 (PDT) X-Received: by 10.152.87.135 with SMTP id ay7mr18917661lab.88.1427865899363; Tue, 31 Mar 2015 22:24:59 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.57.201 with SMTP id k9csp429032lbq; Tue, 31 Mar 2015 22:24:58 -0700 (PDT) X-Received: by 10.70.92.107 with SMTP id cl11mr74497653pdb.31.1427865897482; Tue, 31 Mar 2015 22:24:57 -0700 (PDT) Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id to6si1217299pac.14.2015.03.31.22.24.56; Tue, 31 Mar 2015 22:24:57 -0700 (PDT) Received-SPF: none (google.com: piglit-bounces@lists.freedesktop.org does not designate permitted sender hosts) client-ip=131.252.210.177; Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 427D66E0B5; Tue, 31 Mar 2015 22:24:56 -0700 (PDT) X-Original-To: piglit@lists.freedesktop.org Delivered-To: piglit@lists.freedesktop.org Received: from nm4-vm5.bullet.mail.gq1.yahoo.com (nm4-vm5.bullet.mail.gq1.yahoo.com [98.136.218.164]) by gabe.freedesktop.org (Postfix) with ESMTP id 9CCA86E0B5 for ; Tue, 31 Mar 2015 22:24:55 -0700 (PDT) Received: from [98.137.12.60] by nm4.bullet.mail.gq1.yahoo.com with NNFMP; 01 Apr 2015 05:24:55 -0000 Received: from [208.71.42.202] by tm5.bullet.mail.gq1.yahoo.com with NNFMP; 01 Apr 2015 05:24:55 -0000 Received: from [127.0.0.1] by smtp213.mail.gq1.yahoo.com with NNFMP; 01 Apr 2015 05:24:55 -0000 X-Yahoo-Newman-Id: 111527.33246.bm@smtp213.mail.gq1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: 8oVGB6QVM1kLhuVw1MXxGSO4W5DOaHzIdycRVRmpIaXGkL5 nB9OZSl5sRqHx5eZJwBHs7Z4BbguJAz3ZanK2Tq2DlsvWLIiJL0IH4Kq1Oa_ FzLFAMHzFcKmuT.FkhfUehZB6Lwohnfww29aUyH_tswBUCUccCJQDAycqX2T upOyPJMd7k8dpLQD6lVt_jNaRKq3VgzX8wCmlVeizgNVT7XgW3Xs0Qqra5Dk pqR8sQOc.ZxIwfKI7S3nJ8se6BZD_LBI5fnpqSqg8I682XiCLgXE0FvfVnzE vtMGArYjvtzoP2HHMYyiuPfbS7AUGX59MUndn0.GdzX2Majc8WRwQQqjmXyc LTvdVIZMAVymruF1lTY610m0MMYck5lKW7BGgko6NBTdtfE00woIacn7V3ts eV6UeNSVAA08mWZHzsKyw8aeUiVLa0I_srecnOqqBxh5jiF3MiZjJTPVr4mL dDl9tRcwQrNX4jh3hVmP9xqtAdTkvDcOoCM7THSiiEmYJNI2dddwXZkQVbq3 pb.3Eq35YbGrQYOvcmnMPmv_lulNCIEsZuro- X-Yahoo-SMTP: 9BNlx.aswBAkr0D8mG_whiOP1dyU From: "'Timothy Arceri' via Patchwork Forward" To: piglit@lists.freedesktop.org Date: Wed, 1 Apr 2015 16:24:28 +1100 Message-Id: <1427865868-11236-1-git-send-email-t_arceri@yahoo.com.au> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1427864487-10053-2-git-send-email-t_arceri@yahoo.com.au> References: <1427864487-10053-2-git-send-email-t_arceri@yahoo.com.au> Subject: [Piglit] [PATCH V2 2/2] arb_arrays_of_arrays: compile test all basic types X-BeenThere: piglit@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: piglit-bounces@lists.freedesktop.org Sender: "Piglit" X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::232 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@; dmarc=fail (p=NONE dis=NONE) header.from=yahoo.com.au Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 X-Original-From: Timothy Arceri Reply-To: Timothy Arceri V2: fix glsl-1.20-basic-types.vert previously it contained the glsl-4.20-basic-types.frag test Test results: Nvidia GeForce 840M - NVIDIA 346.47: pass --- .../compiler/glsl-1.20-basic-types.vert | 44 +++++++++++++++++++++ .../compiler/glsl-1.30-basic-types.vert | 31 +++++++++++++++ .../compiler/glsl-1.40-basic-types.vert | 19 +++++++++ .../compiler/glsl-1.50-basic-types.vert | 18 +++++++++ .../compiler/glsl-4.00-basic-types.vert | 32 +++++++++++++++ .../compiler/glsl-4.20-basic-types.frag | 46 ++++++++++++++++++++++ 6 files changed, 190 insertions(+) create mode 100644 tests/spec/arb_arrays_of_arrays/compiler/glsl-1.20-basic-types.vert create mode 100644 tests/spec/arb_arrays_of_arrays/compiler/glsl-1.30-basic-types.vert create mode 100644 tests/spec/arb_arrays_of_arrays/compiler/glsl-1.40-basic-types.vert create mode 100644 tests/spec/arb_arrays_of_arrays/compiler/glsl-1.50-basic-types.vert create mode 100644 tests/spec/arb_arrays_of_arrays/compiler/glsl-4.00-basic-types.vert create mode 100644 tests/spec/arb_arrays_of_arrays/compiler/glsl-4.20-basic-types.frag diff --git a/tests/spec/arb_arrays_of_arrays/compiler/glsl-1.20-basic-types.vert b/tests/spec/arb_arrays_of_arrays/compiler/glsl-1.20-basic-types.vert new file mode 100644 index 0000000..0ce45da --- /dev/null +++ b/tests/spec/arb_arrays_of_arrays/compiler/glsl-1.20-basic-types.vert @@ -0,0 +1,44 @@ +/* [config] + * expect_result: pass + * glsl_version: 1.20 + * [end config] + * + * From page 19 (page 25 of the PDF) of the GLSL 1.20 spec: + * + * "All basic types and structures can be formed into arrays." + */ +#version 120 +#extension GL_ARB_arrays_of_arrays: enable + +uniform float array01[1][1]; +uniform int array02[1][1]; +uniform bool array03[1][1]; +uniform vec2 array04[1][1]; +uniform vec3 array05[1][1]; +uniform vec4 array06[1][1]; +uniform ivec2 array07[1][1]; +uniform ivec3 array08[1][1]; +uniform ivec4 array09[1][1]; +uniform bvec2 array10[1][1]; +uniform bvec3 array11[1][1]; +uniform bvec4 array12[1][1]; +uniform mat2 array13[1][1]; +uniform mat2x2 array14[1][1]; +uniform mat2x3 array15[1][1]; +uniform mat2x4 array16[1][1]; +uniform mat3 array17[1][1]; +uniform mat3x2 array18[1][1]; +uniform mat3x3 array19[1][1]; +uniform mat3x4 array20[1][1]; +uniform mat4 array21[1][1]; +uniform mat4x2 array22[1][1]; +uniform mat4x3 array23[1][1]; +uniform mat4x4 array24[1][1]; +uniform sampler1D array25[1][1]; +uniform sampler2D array26[1][1]; +uniform sampler3D array27[1][1]; +uniform samplerCube array28[1][1]; +uniform sampler1DShadow array29[1][1]; +uniform sampler2DShadow array30[1][1]; + +void main() { gl_Position = vec4(0.0); } diff --git a/tests/spec/arb_arrays_of_arrays/compiler/glsl-1.30-basic-types.vert b/tests/spec/arb_arrays_of_arrays/compiler/glsl-1.30-basic-types.vert new file mode 100644 index 0000000..a712980 --- /dev/null +++ b/tests/spec/arb_arrays_of_arrays/compiler/glsl-1.30-basic-types.vert @@ -0,0 +1,31 @@ +/* [config] + * expect_result: pass + * glsl_version: 1.30 + * [end config] + * + * Test the basic types added in glsl 1.30 + */ +#version 130 +#extension GL_ARB_arrays_of_arrays: enable + +uniform uint array01[1][1]; +uniform uvec2 array02[1][1]; +uniform uvec3 array03[1][1]; +uniform uvec4 array04[1][1]; +uniform samplerCubeShadow array05[1][1]; +uniform sampler1DArray array06[1][1]; +uniform sampler2DArray array07[1][1]; +uniform isampler1D array08[1][1]; +uniform isampler2D array09[1][1]; +uniform isampler3D array10[1][1]; +uniform isamplerCube array11[1][1]; +uniform isampler1DArray array12[1][1]; +uniform isampler2DArray array13[1][1]; +uniform usampler1D array14[1][1]; +uniform usampler2D array15[1][1]; +uniform usampler3D array16[1][1]; +uniform usamplerCube array17[1][1]; +uniform usampler1DArray array18[1][1]; +uniform usampler2DArray array19[1][1]; + +void main() { gl_Position = vec4(0.0); } diff --git a/tests/spec/arb_arrays_of_arrays/compiler/glsl-1.40-basic-types.vert b/tests/spec/arb_arrays_of_arrays/compiler/glsl-1.40-basic-types.vert new file mode 100644 index 0000000..4d83565 --- /dev/null +++ b/tests/spec/arb_arrays_of_arrays/compiler/glsl-1.40-basic-types.vert @@ -0,0 +1,19 @@ +/* [config] + * expect_result: pass + * glsl_version: 1.40 + * [end config] + * + * Test the basic types added in glsl 1.40 + */ +#version 140 +#extension GL_ARB_arrays_of_arrays: enable + +uniform sampler2DRect array01[1][1]; +uniform isampler2DRect array02[1][1]; +uniform usampler2DRect array03[1][1]; +uniform sampler2DRectShadow array04[1][1]; +uniform samplerBuffer array05[1][1]; +uniform isamplerBuffer array06[1][1]; +uniform usamplerBuffer array07[1][1]; + +void main() { gl_Position = vec4(0.0); } diff --git a/tests/spec/arb_arrays_of_arrays/compiler/glsl-1.50-basic-types.vert b/tests/spec/arb_arrays_of_arrays/compiler/glsl-1.50-basic-types.vert new file mode 100644 index 0000000..8996870 --- /dev/null +++ b/tests/spec/arb_arrays_of_arrays/compiler/glsl-1.50-basic-types.vert @@ -0,0 +1,18 @@ +/* [config] + * expect_result: pass + * glsl_version: 1.50 + * [end config] + * + * Test the basic types added in glsl 1.50 + */ +#version 150 +#extension GL_ARB_arrays_of_arrays: enable + +uniform sampler2DMS array01[1][1]; +uniform isampler2DMS array02[1][1]; +uniform usampler2DMS array03[1][1]; +uniform sampler2DMSArray array04[1][1]; +uniform isampler2DMSArray array05[1][1]; +uniform usampler2DMSArray array06[1][1]; + +void main() { gl_Position = vec4(0.0); } diff --git a/tests/spec/arb_arrays_of_arrays/compiler/glsl-4.00-basic-types.vert b/tests/spec/arb_arrays_of_arrays/compiler/glsl-4.00-basic-types.vert new file mode 100644 index 0000000..dd6ea25 --- /dev/null +++ b/tests/spec/arb_arrays_of_arrays/compiler/glsl-4.00-basic-types.vert @@ -0,0 +1,32 @@ +/* [config] + * expect_result: pass + * glsl_version: 4.00 + * [end config] + * + * Test the basic types added in glsl 4.00 + */ +#version 400 +#extension GL_ARB_arrays_of_arrays: enable + +uniform double array01[1][1]; +uniform dvec2 array02[1][1]; +uniform dvec3 array03[1][1]; +uniform dvec4 array04[1][1]; +uniform dmat2 array05[1][1]; +uniform dmat2x2 array06[1][1]; +uniform dmat2x3 array07[1][1]; +uniform dmat2x4 array08[1][1]; +uniform dmat3 array09[1][1]; +uniform dmat3x2 array10[1][1]; +uniform dmat3x3 array11[1][1]; +uniform dmat3x4 array12[1][1]; +uniform dmat4 array13[1][1]; +uniform dmat4x2 array14[1][1]; +uniform dmat4x3 array15[1][1]; +uniform dmat4x4 array16[1][1]; +uniform samplerCubeArray array17[1][1]; +uniform isamplerCubeArray array18[1][1]; +uniform usamplerCubeArray array19[1][1]; +uniform samplerCubeArrayShadow array20[1][1]; + +void main() { gl_Position = vec4(0.0); } diff --git a/tests/spec/arb_arrays_of_arrays/compiler/glsl-4.20-basic-types.frag b/tests/spec/arb_arrays_of_arrays/compiler/glsl-4.20-basic-types.frag new file mode 100644 index 0000000..3bb25e1 --- /dev/null +++ b/tests/spec/arb_arrays_of_arrays/compiler/glsl-4.20-basic-types.frag @@ -0,0 +1,46 @@ +/* [config] + * expect_result: pass + * glsl_version: 4.20 + * [end config] + * + * Test the basic types added in glsl 4.20 + */ +#version 420 +#extension GL_ARB_arrays_of_arrays: enable + +uniform atomic_uint array01[1][1]; +writeonly uniform image1D array02[1][1]; +writeonly uniform iimage1D array03[1][1]; +writeonly uniform uimage1D array04[1][1]; +writeonly uniform image2D array05[1][1]; +writeonly uniform iimage2D array06[1][1]; +writeonly uniform uimage2D array07[1][1]; +writeonly uniform image3D array08[1][1]; +writeonly uniform iimage3D array09[1][1]; +writeonly uniform uimage3D array10[1][1]; +writeonly uniform image2DRect array11[1][1]; +writeonly uniform iimage2DRect array12[1][1]; +writeonly uniform uimage2DRect array13[1][1]; +writeonly uniform imageCube array14[1][1]; +writeonly uniform iimageCube array15[1][1]; +writeonly uniform uimageCube array16[1][1]; +writeonly uniform imageBuffer array17[1][1]; +writeonly uniform iimageBuffer array18[1][1]; +writeonly uniform uimageBuffer array19[1][1]; +writeonly uniform image1DArray array20[1][1]; +writeonly uniform iimage1DArray array21[1][1]; +writeonly uniform uimage1DArray array22[1][1]; +writeonly uniform image2DArray array23[1][1]; +writeonly uniform iimage2DArray array24[1][1]; +writeonly uniform uimage2DArray array25[1][1]; +writeonly uniform imageCubeArray array26[1][1]; +writeonly uniform iimageCubeArray array27[1][1]; +writeonly uniform uimageCubeArray array28[1][1]; +writeonly uniform image2DMS array29[1][1]; +writeonly uniform iimage2DMS array30[1][1]; +writeonly uniform uimage2DMS array31[1][1]; +writeonly uniform image2DMSArray array32[1][1]; +writeonly uniform iimage2DMSArray array33[1][1]; +writeonly uniform uimage2DMSArray array34[1][1]; + +void main() { gl_FragColor = vec4(0.0); }