From patchwork Wed Dec 24 06:12:21 2014 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: 42625 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7ADBF2188F for ; Wed, 24 Dec 2014 06:12:37 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id d49sf4750519eek.4 for ; Tue, 23 Dec 2014 22:12:36 -0800 (PST) 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:cc: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=c9CBYOW55B5Nq/Btrgbs7qKjoib6Cl/eDceJLpTSSes=; b=BF4bNULntgGA0L9BtojcJLw2wwq5pVDaWDp4lRgrCh1G5I/Nd/1UHSoIK263x1APBg sq/Ejv4Sp4X/pX3XYvLKA1LJjFi4KK2eQQ11MAUZ5YUJSstH7gexndnTIZ+8WilyYO4R SsN97nOcceLyUzONl+0z3dL+mlzq/QfRAytHapr6vChd2Kn9HX0+wJvqtfJx+iVbmCXj Hf5Chtu0QZV+4Oio0WOM69zROX6rlZJEXOUQO3nmkpbwp6ej+S9Dd9FthMEoQhazkNm+ 9jlYg3VHzUZIARQoDcCi7m6fXGpmlL/vODP2wIRF0ed8nJgrgkeogYRS+306h7Nmbwb5 eqtw== X-Gm-Message-State: ALoCoQmtMd8f3GqLif6siieGScMpD+KY/FbTfpBaqZUMuBTk2SrefsHdrq0mw3PAAl365g36mIQK X-Received: by 10.152.2.40 with SMTP id 8mr2955lar.7.1419401556661; Tue, 23 Dec 2014 22:12:36 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.26.200 with SMTP id n8ls1114007lag.15.gmail; Tue, 23 Dec 2014 22:12:36 -0800 (PST) X-Received: by 10.112.97.163 with SMTP id eb3mr10564198lbb.47.1419401556545; Tue, 23 Dec 2014 22:12:36 -0800 (PST) Received: from mail-lb0-x236.google.com (mail-lb0-x236.google.com. [2a00:1450:4010:c04::236]) by mx.google.com with ESMTPS id f8si13077684lae.82.2014.12.23.22.12.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Dec 2014 22:12:36 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::236 as permitted sender) client-ip=2a00:1450:4010:c04::236; Received: by mail-lb0-f182.google.com with SMTP id f15so6869699lbj.41 for ; Tue, 23 Dec 2014 22:12:36 -0800 (PST) X-Received: by 10.112.41.234 with SMTP id i10mr32872128lbl.25.1419401556312; Tue, 23 Dec 2014 22:12:36 -0800 (PST) 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.142.69 with SMTP id ru5csp1540467lbb; Tue, 23 Dec 2014 22:12:35 -0800 (PST) X-Received: by 10.68.175.97 with SMTP id bz1mr50588493pbc.90.1419401554255; Tue, 23 Dec 2014 22:12:34 -0800 (PST) Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id ir10si33140706pbc.62.2014.12.23.22.12.33; Tue, 23 Dec 2014 22:12:34 -0800 (PST) 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 39DF26E580; Tue, 23 Dec 2014 22:12:33 -0800 (PST) X-Original-To: piglit@lists.freedesktop.org Delivered-To: piglit@lists.freedesktop.org Received: from nm14-vm2.bullet.mail.gq1.yahoo.com (nm14-vm2.bullet.mail.gq1.yahoo.com [98.136.218.253]) by gabe.freedesktop.org (Postfix) with ESMTP id A74D16E580 for ; Tue, 23 Dec 2014 22:12:32 -0800 (PST) Received: from [98.137.12.189] by nm14.bullet.mail.gq1.yahoo.com with NNFMP; 24 Dec 2014 06:12:32 -0000 Received: from [208.71.42.198] by tm10.bullet.mail.gq1.yahoo.com with NNFMP; 24 Dec 2014 06:12:32 -0000 Received: from [127.0.0.1] by smtp209.mail.gq1.yahoo.com with NNFMP; 24 Dec 2014 06:12:32 -0000 X-Yahoo-Newman-Id: 226441.64360.bm@smtp209.mail.gq1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: WhxbORcVM1nYBlN0kGG2ZTf.SVapvjyjtQYwsCvjOE6ZoZ1 ctI131UICjBjCosn6oKTOwAOrqJzNGSUqPFPHaIbVIC5L_Zc0vUB1j5PGNnN SLQ7qX_h84sQWhQ3ywOXWNqm9lE49tEGynQTFNcJ69peRvFKWfUIoWuiC7wS dDuIcPZKS0H.kRKUVNheFVka7HklTK022wvGUcJSbCgHCW89nGyI_xn3VZUA _hRtafY2bZEmMxyTFLSVD3GsY4iyM2tORRRE14t459O0klga62fHzHLMiSNa fKuFwPDV.w_w8mXdGFu0MVDlhdzpTOlgbOSMy8C6hWOuBm6joTiaAPjto1dN Fwm75PFCFdj7juzhxy274yy7SkunCcpbQRfdaQ_WN2UKwL3oPQhCegmHgSU6 oZKpASdJf454JarpzwNBxqKYcJnM_DshOHUXVoUMmf8nDZzWhShPq4vjI1EV 8X7h7WPmdk5AEFBhl2I7FAclysfoarywC7TYYZvIU1d6Tx5xr2PGBwwlzeU. s_okX_GMbdj6vla02Orfz.RWCb3Awng-- X-Yahoo-SMTP: 9BNlx.aswBAkr0D8mG_whiOP1dyU From: "'Timothy Arceri' via Patchwork Forward" To: piglit@lists.freedesktop.org Date: Wed, 24 Dec 2014 17:12:21 +1100 Message-Id: <1419401541-698-1-git-send-email-t_arceri@yahoo.com.au> X-Mailer: git-send-email 2.1.0 Cc: Timothy Arceri Subject: [Piglit] [PATCH] glsl-1.50: fix some linker 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: , 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::236 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 From: Timothy Arceri dont assign values to shader inputs --- I didn't realise my mistake as Mesa currently allows inputs to change. I'm working on some Mesa fixes for this. .../intrastage-unsized-interface-array-mismatch.shader_test | 12 +++++------- ...intrastage-unsized-interface-array-mismatch2.shader_test | 13 +++++-------- .../linker/intrastage-unsized-interface-array.shader_test | 12 +++++------- .../linker/intrastage-unsized-interface-array2.shader_test | 13 +++++-------- 4 files changed, 20 insertions(+), 30 deletions(-) diff --git a/tests/spec/glsl-1.50/linker/intrastage-unsized-interface-array-mismatch.shader_test b/tests/spec/glsl-1.50/linker/intrastage-unsized-interface-array-mismatch.shader_test index 9e373a2..7072659 100644 --- a/tests/spec/glsl-1.50/linker/intrastage-unsized-interface-array-mismatch.shader_test +++ b/tests/spec/glsl-1.50/linker/intrastage-unsized-interface-array-mismatch.shader_test @@ -14,6 +14,7 @@ out ArrayInterfaceBlock void main() { + i.a = vec4(1.0); gl_Position = vec4(1.0); } @@ -28,9 +29,9 @@ in ArrayInterfaceBlock vec4 a; } i[4]; -void f() +vec4 f() { - i[1].a = vec4(1, 0, 0, 1); + return i[1].a; } [geometry shader] @@ -41,14 +42,11 @@ in ArrayInterfaceBlock vec4 a; } i[]; -void f(); +vec4 f(); void main() { - f(); - i[4].a = vec4(1, 0, 0, 1); - - gl_Position = i[3].a; + gl_Position = i[4].a + f(); } [test] diff --git a/tests/spec/glsl-1.50/linker/intrastage-unsized-interface-array-mismatch2.shader_test b/tests/spec/glsl-1.50/linker/intrastage-unsized-interface-array-mismatch2.shader_test index d661795..e7f1195 100644 --- a/tests/spec/glsl-1.50/linker/intrastage-unsized-interface-array-mismatch2.shader_test +++ b/tests/spec/glsl-1.50/linker/intrastage-unsized-interface-array-mismatch2.shader_test @@ -14,6 +14,7 @@ out ArrayInterfaceBlock void main() { + i.a = vec4(1.0); gl_Position = vec4(1.0); } @@ -25,15 +26,14 @@ in ArrayInterfaceBlock vec4 a; } i[]; -void f() +vec4 f() { - i[4].a = vec4(1, 0, 0, 1); + return i[4].a; } [geometry shader] #version 150 - layout(lines_adjacency) in; layout(triangle_strip, max_vertices = 3) out; @@ -42,14 +42,11 @@ in ArrayInterfaceBlock vec4 a; } i[4]; -void f(); +vec4 f(); void main() { - f(); - i[3].a = vec4(1, 0, 0, 1); - - gl_Position = i[3].a; + gl_Position = i[3].a + f(); } [test] diff --git a/tests/spec/glsl-1.50/linker/intrastage-unsized-interface-array.shader_test b/tests/spec/glsl-1.50/linker/intrastage-unsized-interface-array.shader_test index 1dfae4f..06430c2 100644 --- a/tests/spec/glsl-1.50/linker/intrastage-unsized-interface-array.shader_test +++ b/tests/spec/glsl-1.50/linker/intrastage-unsized-interface-array.shader_test @@ -14,6 +14,7 @@ out ArrayInterfaceBlock void main() { + i.a = vec4(1.0); gl_Position = vec4(1.0); } @@ -28,9 +29,9 @@ in ArrayInterfaceBlock vec4 a; } i[4]; -void f() +vec4 f() { - i[1].a = vec4(1, 0, 0, 1); + return i[1].a; } [geometry shader] @@ -41,14 +42,11 @@ in ArrayInterfaceBlock vec4 a; } i[]; -void f(); +vec4 f(); void main() { - f(); - i[3].a = vec4(1, 0, 0, 1); - - gl_Position = i[3].a; + gl_Position = i[3].a + f(); } [test] diff --git a/tests/spec/glsl-1.50/linker/intrastage-unsized-interface-array2.shader_test b/tests/spec/glsl-1.50/linker/intrastage-unsized-interface-array2.shader_test index 1ad5b08..1ddc975 100644 --- a/tests/spec/glsl-1.50/linker/intrastage-unsized-interface-array2.shader_test +++ b/tests/spec/glsl-1.50/linker/intrastage-unsized-interface-array2.shader_test @@ -14,6 +14,7 @@ out ArrayInterfaceBlock void main() { + i.a = vec4(1.0); gl_Position = vec4(1.0); } @@ -25,15 +26,14 @@ in ArrayInterfaceBlock vec4 a; } i[]; -void f() +vec4 f() { - i[3].a = vec4(1, 0, 0, 1); + return i[3].a; } [geometry shader] #version 150 - layout(lines_adjacency) in; layout(triangle_strip, max_vertices = 3) out; @@ -42,14 +42,11 @@ in ArrayInterfaceBlock vec4 a; } i[4]; -void f(); +vec4 f(); void main() { - f(); - i[3].a = vec4(1, 0, 0, 1); - - gl_Position = i[3].a; + gl_Position = i[3].a + f(); } [test]