From patchwork Fri Jun 26 23:14:14 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: 50382 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9DF84228FD for ; Fri, 26 Jun 2015 23:14:41 +0000 (UTC) Received: by wgbbj7 with SMTP id bj7sf30651822wgb.2 for ; Fri, 26 Jun 2015 16:14:40 -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=SZIxjJ/h04ks84X7W/eNODfV78+BiAFqd7iAcuIm3O0=; b=UBwnns5899UI/KiymJDYmXRUX8zPfweA/UNB7rFt83X+OxFgWvAwdktS5K0hTe7aY7 sn6gpK5pizyk9+78mFMoJiMN9yXLv00GXHxicHqqNfZQpooxk52Ro2mwCN2oZXTIryEA lrUMPIFAOY1mc5wN1uXihZY0P7XFVHeidqfqQQ7w/X9HM7rQeVe34mpAn0Gg5xsA/zuL 8uLMVWP/sC3tgjhtE7tPv825UKZdWq+mU8jMC8f3ROciBQjj9hrRgCftj+SEI802OxWJ FdsCBby45xEhZG15xWE2tNGQEVrgvbuwdynBa6fRA5hjLsEw7byE00BG2zf13sLWzs8D QaMw== X-Gm-Message-State: ALoCoQlXxmu3R0itbtxIi5JQNiNy7s24yHZQ0oRO+VdKB0Mqwf2cpFaOBfP7sPccUf3RmLJT1MwJ X-Received: by 10.112.148.101 with SMTP id tr5mr2682176lbb.13.1435360480787; Fri, 26 Jun 2015 16:14:40 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.115.198 with SMTP id jq6ls401761lab.4.gmail; Fri, 26 Jun 2015 16:14:40 -0700 (PDT) X-Received: by 10.112.50.230 with SMTP id f6mr3710109lbo.17.1435360480544; Fri, 26 Jun 2015 16:14:40 -0700 (PDT) Received: from mail-la0-x22a.google.com (mail-la0-x22a.google.com. [2a00:1450:4010:c03::22a]) by mx.google.com with ESMTPS id ng4si19573448lbc.115.2015.06.26.16.14.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Jun 2015 16:14:40 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::22a as permitted sender) client-ip=2a00:1450:4010:c03::22a; Received: by lacny3 with SMTP id ny3so71583421lac.3 for ; Fri, 26 Jun 2015 16:14:40 -0700 (PDT) X-Received: by 10.152.36.161 with SMTP id r1mr3732099laj.88.1435360480271; Fri, 26 Jun 2015 16:14:40 -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 hn6csp218024lbb; Fri, 26 Jun 2015 16:14:39 -0700 (PDT) X-Received: by 10.70.20.5 with SMTP id j5mr7958933pde.40.1435360478523; Fri, 26 Jun 2015 16:14:38 -0700 (PDT) Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id y5si49345100par.87.2015.06.26.16.14.37; Fri, 26 Jun 2015 16:14:38 -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 5ABA56E1D8; Fri, 26 Jun 2015 16:14:37 -0700 (PDT) X-Original-To: piglit@lists.freedesktop.org Delivered-To: piglit@lists.freedesktop.org Received: from nm15-vm4.bullet.mail.gq1.yahoo.com (nm15-vm4.bullet.mail.gq1.yahoo.com [98.137.176.76]) by gabe.freedesktop.org (Postfix) with ESMTP id 447296E1D8 for ; Fri, 26 Jun 2015 16:14:35 -0700 (PDT) Received: from [216.39.60.183] by nm15.bullet.mail.gq1.yahoo.com with NNFMP; 26 Jun 2015 23:14:35 -0000 Received: from [208.71.42.200] by tm19.bullet.mail.gq1.yahoo.com with NNFMP; 26 Jun 2015 23:14:35 -0000 Received: from [127.0.0.1] by smtp211.mail.gq1.yahoo.com with NNFMP; 26 Jun 2015 23:14:35 -0000 X-Yahoo-Newman-Id: 228026.12913.bm@smtp211.mail.gq1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: ogn02OkVM1mfPnWv82wIjCk4kNL.t3wqLJruDqhnmvvFTdm tplVxvSI2QoklLuNPEAHQ3hsSPsRvGKqyZV.pyg797O8vqwVfSHeJXl8t3ou xEeg4SEp_wRNBXlt4oOvy8UfI3K9IxVzEv7sshV8OHXQoyvhQ2PFVkY9.e6s 7W1kZgyAmfSXVViE0k_rVMfzDo9Rto9bz0vYf9yoHvehViELqLOVwgWUAoPc jEVdyWRXO2mMaL2OgVydXJZkzVD9q5Fiqtx_ZKbWQQgUBH80iB7RhEI1TbLv MHOz0gtx3SXmBBrtzpZioQ7axP03Y5Ts5biXoehIMw5XvgrADMgJVvuulY2u J60B4YfU.0UrHmzubJr35M78.ASw8IvpahHIyRK.dphNefAkuN56DfGnvMu. wM9FVwLVn1hbyAxupAgJxBVEtX1vuP9l9_7tnUacY9KkkntWXWxE8fQzhW1B Wdkf_gbnxrdjkFSt_TF0v8TdA5Dc1xwx.87o.sIpyok_VYk3HyGQuzjMNBcj .LUDGaEBF0htioGLZKjDhlIasxalehrhQPCU- X-Yahoo-SMTP: 9BNlx.aswBAkr0D8mG_whiOP1dyU From: "'Timothy Arceri' via Patchwork Forward" To: piglit@lists.freedesktop.org Date: Sat, 27 Jun 2015 09:14:14 +1000 Message-Id: <1435360454-3621-1-git-send-email-t_arceri@yahoo.com.au> X-Mailer: git-send-email 2.4.3 MIME-Version: 1.0 Subject: [Piglit] [PATCH] arb_program_interface_query: update and fix 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::22a 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 Add a 3D array test and fix the expected result for an array without a subscript attached to the name. The arb_program_interface_query spec says: "If exactly matches the name string of one of the active resources for , the index of the matched resource is returned. Additionally, if would exactly match the name string of an active resource if "[0]" were appended to , the index of the matched resource is returned." So the index should not be INVALID_INDEX when there is no subscript. Cc: Martin Peres Cc: Tapani Pälli --- .../arb_program_interface_query/getprogramresourceindex.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/spec/arb_program_interface_query/getprogramresourceindex.c b/tests/spec/arb_program_interface_query/getprogramresourceindex.c index 889b5e1..18bb1af 100755 --- a/tests/spec/arb_program_interface_query/getprogramresourceindex.c +++ b/tests/spec/arb_program_interface_query/getprogramresourceindex.c @@ -170,11 +170,21 @@ static const struct subtest_index_t index_subtests[] = { ST(vs_array, GL_UNIFORM, "sa[0].world", 0, GL_NO_ERROR), ST(vs_array, GL_UNIFORM, "sa[0].world[0]", 0, GL_NO_ERROR), ST(vs_array, GL_UNIFORM, "sa[1].hello", -1, GL_NO_ERROR), - ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input2", -1, GL_NO_ERROR), + ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input2", 0, GL_NO_ERROR), ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input2[0]", 0, GL_NO_ERROR), 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_input3", 0, GL_NO_ERROR), + ST( vs_aofa, GL_PROGRAM_INPUT, "vs_input3[0]", 0, 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][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_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),