From patchwork Wed Apr 1 05:44:18 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: 46611 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C86DE2159A for ; Wed, 1 Apr 2015 05:44:45 +0000 (UTC) Received: by layy10 with SMTP id y10sf1811804lay.0 for ; Tue, 31 Mar 2015 22:44:44 -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=P+FUMl3ytNu3Wrq7VYgFPC0P6kJoDdbcEMwhRXt9b4A=; b=A59gMPEvNzgWGxzrSY3EdXuPSMYXIvGRsg5Kbum1FzSYaC7R5Q5DTrajEEkrg9CiHK a9TPQYHLR7D6DQ+4FtuT36bZjho3/MTbKsVjcdqIr2eRNhlSI659xyt58YZkCetc/S5T aGzU9uY7NCQk6q1JTI1ODF75kfDbYhj527L5hag2jX0pXfmoethN6yw2iz67iKZXvapQ HqDOGfUZbb96BGW2G7KkmHcw9Anba4C0i2I/2WDli1BfVm1IldonBPbzsiKzTvlU80tN KjiYVBkX0yVhTZEC7Z5qhhaB51rZVe3msQN3v7Pb2sp5Sulg7tt3rGBcKJn5ZdY3uyjf wWHg== X-Gm-Message-State: ALoCoQnyO3sBr6OzuYyti+kxiuue86mlvpR/WfCXXJLbAJh4dfJm43wW/ybpjOVDUuvTcV5V96DC X-Received: by 10.152.164.171 with SMTP id yr11mr9084470lab.4.1427867083816; Tue, 31 Mar 2015 22:44:43 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.4.12 with SMTP id ca12ls24408lad.41.gmail; Tue, 31 Mar 2015 22:44:43 -0700 (PDT) X-Received: by 10.152.43.3 with SMTP id s3mr34397185lal.101.1427867083629; Tue, 31 Mar 2015 22:44:43 -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 qu8si665189lbb.49.2015.03.31.22.44.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Mar 2015 22:44:43 -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 c10so28116818lbd.2 for ; Tue, 31 Mar 2015 22:44:43 -0700 (PDT) X-Received: by 10.112.212.106 with SMTP id nj10mr33949214lbc.36.1427867083143; Tue, 31 Mar 2015 22:44:43 -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 k9csp436443lbq; Tue, 31 Mar 2015 22:44:41 -0700 (PDT) X-Received: by 10.66.182.201 with SMTP id eg9mr33234950pac.68.1427867081018; Tue, 31 Mar 2015 22:44:41 -0700 (PDT) Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id sz7si1169216pbc.201.2015.03.31.22.44.40; Tue, 31 Mar 2015 22:44:41 -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 C514A6E7D9; Tue, 31 Mar 2015 22:44:39 -0700 (PDT) X-Original-To: piglit@lists.freedesktop.org Delivered-To: piglit@lists.freedesktop.org Received: from nm3.bullet.mail.gq1.yahoo.com (nm3.bullet.mail.gq1.yahoo.com [98.136.218.68]) by gabe.freedesktop.org (Postfix) with ESMTP id 860C56E7D9 for ; Tue, 31 Mar 2015 22:44:38 -0700 (PDT) Received: from [98.137.12.56] by nm3.bullet.mail.gq1.yahoo.com with NNFMP; 01 Apr 2015 05:44:38 -0000 Received: from [208.71.42.201] by tm1.bullet.mail.gq1.yahoo.com with NNFMP; 01 Apr 2015 05:44:38 -0000 Received: from [127.0.0.1] by smtp212.mail.gq1.yahoo.com with NNFMP; 01 Apr 2015 05:44:38 -0000 X-Yahoo-Newman-Id: 362735.91459.bm@smtp212.mail.gq1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: Bx7A7doVM1mxeo.LvENh3bdpVxJQiWX_na8op0bd9aFrn5f 0GQTryvn7.EkfP_cjfnfEpt7vgW2bxbXZgyG28rqPpRThWojDEdW5xH.JqyB Cxn4r8DYOfy71g.QDpivjMW3dagJ9qdpmd7MOGtj_aupgoQA1Xhp.xEfaVBx L7x3OV2TTrpdqP1BL0c5V2CAuP2Xt5phkLgWeaK4rRKVMhk.Um4odt6XECCu KxDdOAfm6TIoQUNwoy78D_Tq7jfHn4KXH2tM6doBOGLwuQiaRLT97e.UH0.j qqlkPYOfJnd8pmAz._z_f_aglz9R_E.tmoieZyrc7jUa48PXntyf9PPPZ0K. vC06dEETRG6RmulO1TJ1yS6vsOdLZQ4CDLO5QFbb6n0F8qj98tFFex9z1nq2 90j8Ox2hNZ0B_C7SakeYfSA715SGmXBk2d8jvjpR31f_TTVd.h.Cw.9oXIWW 1vi1GLUnQVZv2AKStHwVdnh5BTsaD4cKiyBTH6Xc9rN4GeJEY.LG9M5_HxnP 8Bi3o0qgkChWDzLaAdCP3kT2et0EcoUKzqtU- X-Yahoo-SMTP: 9BNlx.aswBAkr0D8mG_whiOP1dyU From: "'Timothy Arceri' via Patchwork Forward" To: piglit@lists.freedesktop.org Date: Wed, 1 Apr 2015 16:44:18 +1100 Message-Id: <1427867058-12615-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 V3 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 V3: Tell piglit that GL_ARB_arrays_of_arrays is required 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 | 45 +++++++++++++++++++++ .../compiler/glsl-1.30-basic-types.vert | 32 +++++++++++++++ .../compiler/glsl-1.40-basic-types.vert | 20 +++++++++ .../compiler/glsl-1.50-basic-types.vert | 19 +++++++++ .../compiler/glsl-4.00-basic-types.vert | 33 +++++++++++++++ .../compiler/glsl-4.20-basic-types.frag | 47 ++++++++++++++++++++++ 6 files changed, 196 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..02c5c67 --- /dev/null +++ b/tests/spec/arb_arrays_of_arrays/compiler/glsl-1.20-basic-types.vert @@ -0,0 +1,45 @@ +/* [config] + * expect_result: pass + * glsl_version: 1.20 + * require_extensions: GL_ARB_arrays_of_arrays + * [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..1e718ea --- /dev/null +++ b/tests/spec/arb_arrays_of_arrays/compiler/glsl-1.30-basic-types.vert @@ -0,0 +1,32 @@ +/* [config] + * expect_result: pass + * glsl_version: 1.30 + * require_extensions: GL_ARB_arrays_of_arrays + * [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..a4488bc --- /dev/null +++ b/tests/spec/arb_arrays_of_arrays/compiler/glsl-1.40-basic-types.vert @@ -0,0 +1,20 @@ +/* [config] + * expect_result: pass + * glsl_version: 1.40 + * require_extensions: GL_ARB_arrays_of_arrays + * [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..7eb6420 --- /dev/null +++ b/tests/spec/arb_arrays_of_arrays/compiler/glsl-1.50-basic-types.vert @@ -0,0 +1,19 @@ +/* [config] + * expect_result: pass + * glsl_version: 1.50 + * require_extensions: GL_ARB_arrays_of_arrays + * [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..4cc7a50 --- /dev/null +++ b/tests/spec/arb_arrays_of_arrays/compiler/glsl-4.00-basic-types.vert @@ -0,0 +1,33 @@ +/* [config] + * expect_result: pass + * glsl_version: 4.00 + * require_extensions: GL_ARB_arrays_of_arrays + * [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..e0dd221 --- /dev/null +++ b/tests/spec/arb_arrays_of_arrays/compiler/glsl-4.20-basic-types.frag @@ -0,0 +1,47 @@ +/* [config] + * expect_result: pass + * glsl_version: 4.20 + * require_extensions: GL_ARB_arrays_of_arrays + * [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); }