From patchwork Sat Jul 4 00:17:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: 'Timothy Arceri' via Patchwork Forward X-Patchwork-Id: 50646 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 B483E22916 for ; Sat, 4 Jul 2015 00:18:07 +0000 (UTC) Received: by lagh6 with SMTP id h6sf32225777lag.0 for ; Fri, 03 Jul 2015 17:18:05 -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:mime-version:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:reply-to; bh=6bIvhMqPlmn/wpHc2kXoxoxUuEMfntHsEtLk00GeXx8=; b=PI+yPK9MbeJi8VvSuCETX9ZiE2lDx8KB7TN1pzLwW0+pbBWg4owCY2qae3YgE4gW0Q gVsQXCh0mwzMq6nHWBjZMwAhWG3U9tKgiK5ODIpjdni0B/EKQuPBLXSurPrPRSQYme1/ qmDBD3HFHsQJpheymWXZsGa+2tHgxb5T+oqZDhxIgh+W3v7JTuz/EQYmp28IxobVB1Qr K/IPZ3zU1/0CFrcQ+O1oCSbu0+v247c+RsX0u5j+6Q9ONZnjS4n7kk9jAw+PcToGL/eu F55wbaIFoCHvriXbqEfYMPP78ysIOiOMwAmrzpb0atbh/41+giGLsNxCvXYlbAH1boUq ZtMA== X-Gm-Message-State: ALoCoQn0mg56M0PV/SYfND/KCaWdhmN0YAUo1e7iiVECuio2CYZqcrpgluyWAia4/cDnP0j5I0AS X-Received: by 10.152.5.2 with SMTP id o2mr23896779lao.0.1435969085432; Fri, 03 Jul 2015 17:18:05 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.131 with SMTP id w3ls544386lal.81.gmail; Fri, 03 Jul 2015 17:18:05 -0700 (PDT) X-Received: by 10.152.120.135 with SMTP id lc7mr37414731lab.107.1435969085183; Fri, 03 Jul 2015 17:18:05 -0700 (PDT) Received: from mail-la0-x230.google.com (mail-la0-x230.google.com. [2a00:1450:4010:c03::230]) by mx.google.com with ESMTPS id ue11si8562534lac.46.2015.07.03.17.18.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Jul 2015 17:18:04 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::230 as permitted sender) client-ip=2a00:1450:4010:c03::230; Received: by lagc2 with SMTP id c2so99573368lag.3 for ; Fri, 03 Jul 2015 17:18:04 -0700 (PDT) X-Received: by 10.112.55.207 with SMTP id u15mr38115223lbp.88.1435969084710; Fri, 03 Jul 2015 17:18:04 -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.108.230 with SMTP id hn6csp321535lbb; Fri, 3 Jul 2015 17:18:03 -0700 (PDT) X-Received: by 10.68.94.131 with SMTP id dc3mr4547487pbb.127.1435969082633; Fri, 03 Jul 2015 17:18:02 -0700 (PDT) Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id u9si16565288pdp.186.2015.07.03.17.18.01; Fri, 03 Jul 2015 17:18:02 -0700 (PDT) Received-SPF: pass (google.com: domain of piglit-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 583066ECBB; Fri, 3 Jul 2015 17:18:01 -0700 (PDT) X-Original-To: piglit@lists.freedesktop.org Delivered-To: piglit@lists.freedesktop.org Received: from nm14-vm5.bullet.mail.gq1.yahoo.com (nm14-vm5.bullet.mail.gq1.yahoo.com [98.136.218.77]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3BDA46ECBB for ; Fri, 3 Jul 2015 17:17:59 -0700 (PDT) Received: from [98.137.12.55] by nm14.bullet.mail.gq1.yahoo.com with NNFMP; 04 Jul 2015 00:17:59 -0000 Received: from [98.136.164.69] by tm15.bullet.mail.gq1.yahoo.com with NNFMP; 04 Jul 2015 00:17:59 -0000 Received: from [127.0.0.1] by smtp231.mail.gq1.yahoo.com with NNFMP; 04 Jul 2015 00:17:59 -0000 X-Yahoo-Newman-Id: 299675.22037.bm@smtp231.mail.gq1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: dNcTQBoVM1mEFU9gAS.yqs46WgSVbdv0v5qGSkaITc3VwyZ HpS5rtRCfszBYO8xnoBmmJ2qN6a.lZpE4jilWOoTgpooJFl.eipYykFbwWr9 .c0HEwMR2VGxsxE5p5aO9_.bsXN_tlfbLWnsaviO2HfBI2kcNBuTjI2mDHe1 2TNMjzVVYbVQFHtq2lSMrDLg4ciXH422aEgJAL1c4MAp47fXfdA1oxOSDf6s i0Ah8ewgRn8kbCrkGXDrBgEssWvZWbPFd6BObqs5Mn86Y1s3D3gH_TaU6ozI 5O8YuZJi_pjmTzFI.t9Q0H4ziURwjCzAN7FIF7MRkEiumvXVD9WifmTWUyYz CUDh.vWKiFO_Dut27YL03NDfftc_4YDMOccEJPavRGrzVY2BCihFUIX0IiH3 MdWcdTo4xJAPAR0k5ZgD_ST3r2_hqB6xMrfQXAsr8lf8kPqSgB_r0hofSlAP gteia25uK4ZiZ6bvbYE0bmIYxOA_kgBYZr7nKOEroOVZAyeRkku5e8cttj_V 4pwyGcGp1KenOo2Mf_Cck0JXW5q5CRUOLpU4- X-Yahoo-SMTP: 9BNlx.aswBAkr0D8mG_whiOP1dyU From: "'Timothy Arceri' via Patchwork Forward" To: piglit@lists.freedesktop.org Date: Sat, 4 Jul 2015 10:17:39 +1000 Message-Id: <1435969060-20918-1-git-send-email-t_arceri@yahoo.com.au> X-Mailer: git-send-email 2.4.3 MIME-Version: 1.0 Subject: [Piglit] [PATCH 1/2] arb_program_interface_query: add more arrays of arrays tests 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: , 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:c03::230 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@yahoo.com.au; 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 >From the ARB_program_interface_query spec (issue 8): We only accept entries of the form "a[2][1][0]" or "a[2][1]", which is consistent with the existing rules that only allow applications to omit the last index of a bottom-level array that has been rolled up. Test results: Nvidia GeForce 840M - NVIDIA 346.47: pass Cc: Tapani Pälli --- tests/spec/arb_program_interface_query/common.h | 9 ++++++++ .../getprogramresourceindex.c | 26 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/tests/spec/arb_program_interface_query/common.h b/tests/spec/arb_program_interface_query/common.h index e083a6e..39e5f24 100755 --- a/tests/spec/arb_program_interface_query/common.h +++ b/tests/spec/arb_program_interface_query/common.h @@ -63,6 +63,15 @@ static const char vs_aofa[] = " gl_Position = vs_input2[0][0] + vs_input3[0][0][0];\n" "}"; +static const char vs_aofa2[] = + "#version 150\n" + "#extension GL_ARB_arrays_of_arrays : require\n" + "in vec4 vs_input2[2][2];\n" + "uniform vec4 vs_uni[2][2][2];\n" + "void main() {\n" + " gl_Position = vs_input2[1][0] + vs_uni[1][0][1];\n" + "}"; + static const char vs_std[] = "#version 150\n" "struct vs_struct {\n" diff --git a/tests/spec/arb_program_interface_query/getprogramresourceindex.c b/tests/spec/arb_program_interface_query/getprogramresourceindex.c index 889b5e1..bc865e5 100755 --- a/tests/spec/arb_program_interface_query/getprogramresourceindex.c +++ b/tests/spec/arb_program_interface_query/getprogramresourceindex.c @@ -175,6 +175,32 @@ static const struct subtest_index_t index_subtests[] = { ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input2[0][0]", 0, GL_NO_ERROR), ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input2[1][0]", -1, GL_NO_ERROR), ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input2[0][1]", -1, GL_NO_ERROR), + ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input2[1][1]", -1, GL_NO_ERROR), + ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input3", -1, GL_NO_ERROR), + ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input3[0]", -1, GL_NO_ERROR), + ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input3[0][0]", 0, GL_NO_ERROR), + ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input3[0][0][0]", 0, GL_NO_ERROR), + ST( vs_aofa, GL_PROGRAM_INPUT,"vs_input3[0][0][00]", -1, GL_NO_ERROR), + ST( vs_aofa, GL_PROGRAM_INPUT,"vs_input3[0][00][0]", -1, GL_NO_ERROR), + ST( vs_aofa, GL_PROGRAM_INPUT,"vs_input3[00][0][0]", -1, GL_NO_ERROR), + ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input3[0][0][1]", -1, GL_NO_ERROR), + ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input3[0][1][0]", -1, GL_NO_ERROR), + ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input3[1][0][0]", -1, GL_NO_ERROR), + ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input3[1][0][1]", -1, GL_NO_ERROR), + ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input3[1][1][0]", -1, GL_NO_ERROR), + ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input3[1][1][1]", -1, GL_NO_ERROR), + ST( vs_aofa2, GL_UNIFORM, "vs_uni", -1, GL_NO_ERROR), + ST( vs_aofa2, GL_UNIFORM, "vs_uni[1]", -1, GL_NO_ERROR), + ST( vs_aofa2, GL_UNIFORM, "vs_uni[0]", -1, GL_NO_ERROR), + ST( vs_aofa2, GL_UNIFORM, "vs_uni[0][0]", -1, GL_NO_ERROR), + ST( vs_aofa2, GL_UNIFORM, "vs_uni[1][0]", 0, GL_NO_ERROR), + ST( vs_aofa2, GL_UNIFORM, "vs_uni[0][0][0]", -1, GL_NO_ERROR), + ST( vs_aofa2, GL_UNIFORM, "vs_uni[0][0][1]", -1, GL_NO_ERROR), + ST( vs_aofa2, GL_UNIFORM, "vs_uni[0][1][0]", -1, GL_NO_ERROR), + ST( vs_aofa2, GL_UNIFORM, "vs_uni[1][0][0]", 0, GL_NO_ERROR), + ST( vs_aofa2, GL_UNIFORM, "vs_uni[1][0][1]", -1, GL_NO_ERROR), + ST( vs_aofa2, GL_UNIFORM, "vs_uni[1][1][0]", -1, GL_NO_ERROR), + ST( vs_aofa2, GL_UNIFORM, "vs_uni[1][1][1]", -1, GL_NO_ERROR), ST( vs_sub, GL_VERTEX_SUBROUTINE, "vss", 0, GL_NO_ERROR), ST(vs_empty, GL_TRANSFORM_FEEDBACK_VARYING, "gl_NextBuffer", -1, GL_NO_ERROR), ST(vs_empty, GL_TRANSFORM_FEEDBACK_VARYING, "gl_SkipComponents1", -1, GL_NO_ERROR),