From patchwork Thu Jun 18 12:59:17 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: 50045 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0E24322903 for ; Thu, 18 Jun 2015 12:59:41 +0000 (UTC) Received: by labsp1 with SMTP id sp1sf21338152lab.3 for ; Thu, 18 Jun 2015 05:59: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: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=yCe7IxtF2SHVd1AJ+SQynL/VZMK4y/P5VreOc0/oj2A=; b=N3QxVfBT1++lhaikJ5dwrHJquCLAsFDxTCxSDLbbigByzVAT1G9G+fMzy7lwCYWxxm UrbHaYrEGV2VEIkLh2P37zeliFMAFF1AFelIlC4u4En1+OGOemCxCKkvONJZ9yhFP/Nf WD7FHsMVLsJFrrj3CY483u5T1rWm73EcO+qvH63DIqTXsmJEbquNOcIoOVSo4xKTC8yX XJRsSXQUHV/S2VwOYosI0bi6oGIwILJmZGfmdco+5fMYWpCIfPYqWFnF4l++dz4nl/q8 kvr9KaIkBr49juWGrwd28WDj5KTHwo45DdMvMI8FV7aaFQbQMhAXtk4LY1XRAyWVEMo3 5XYw== X-Gm-Message-State: ALoCoQkKzQU6eiaJsQEc7gM5nw/1rfy6P0feKkk7rKki41n5ZAbEiyAWyB69KlMGvMF+8CWoCJy+ X-Received: by 10.194.236.230 with SMTP id ux6mr7647278wjc.5.1434632380025; Thu, 18 Jun 2015 05:59:40 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.181.34 with SMTP id dt2ls427561lac.14.gmail; Thu, 18 Jun 2015 05:59:39 -0700 (PDT) X-Received: by 10.112.122.9 with SMTP id lo9mr12934413lbb.104.1434632379886; Thu, 18 Jun 2015 05:59:39 -0700 (PDT) Received: from mail-la0-x235.google.com (mail-la0-x235.google.com. [2a00:1450:4010:c03::235]) by mx.google.com with ESMTPS id pt2si6411912lbb.46.2015.06.18.05.59.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jun 2015 05:59:39 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::235 as permitted sender) client-ip=2a00:1450:4010:c03::235; Received: by labbc20 with SMTP id bc20so53826899lab.1 for ; Thu, 18 Jun 2015 05:59:39 -0700 (PDT) X-Received: by 10.152.22.99 with SMTP id c3mr13212511laf.32.1434632379785; Thu, 18 Jun 2015 05:59:39 -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 hn6csp1165626lbb; Thu, 18 Jun 2015 05:59:38 -0700 (PDT) X-Received: by 10.70.42.37 with SMTP id k5mr21300344pdl.13.1434632377929; Thu, 18 Jun 2015 05:59:37 -0700 (PDT) Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id f3si11302795pdl.5.2015.06.18.05.59.37; Thu, 18 Jun 2015 05:59:37 -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 CFCF57A15B; Thu, 18 Jun 2015 05:59:36 -0700 (PDT) X-Original-To: piglit@lists.freedesktop.org Delivered-To: piglit@lists.freedesktop.org Received: from nm25-vm5.bullet.mail.gq1.yahoo.com (nm25-vm5.bullet.mail.gq1.yahoo.com [98.136.217.116]) by gabe.freedesktop.org (Postfix) with ESMTP id D69DD7A159 for ; Thu, 18 Jun 2015 05:59:35 -0700 (PDT) Received: from [98.137.12.63] by nm25.bullet.mail.gq1.yahoo.com with NNFMP; 18 Jun 2015 12:59:35 -0000 Received: from [208.71.42.194] by tm8.bullet.mail.gq1.yahoo.com with NNFMP; 18 Jun 2015 12:59:35 -0000 Received: from [127.0.0.1] by smtp205.mail.gq1.yahoo.com with NNFMP; 18 Jun 2015 12:59:35 -0000 X-Yahoo-Newman-Id: 200154.7911.bm@smtp205.mail.gq1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: OCZ2eDUVM1mftJ0.UmrCwYFqHBpZ7dPlyeq1De3K0jbmrDi HqSlP5h6ThJ_.HA3UsWLvVaTN0IPdEVZmlGkMo1n.78A61U9o7TfZDXSGZLz MYVy_IgzRQCh5QblcfmRGISnt13Q2mOSjmuYhDSCt_dd_tVDMEdlATCFIsK_ l9rgsoFU6y4kI_jA4ss2HcGdRYKvGT.z4Xs9j0YA96eD6R67vzatubx7QqTJ hbsL.z9gbVcI2aKkyurUyDsrzY.3Swx7M8wl6sV3lwLrKcFUHOE6O0hMh1Hi ctwLgfQhYSIt1EvNW7cN0LdQxtL64L2VFi2UNXf6LXbxtZXyo2JWbxH1sDCz KKsYJZDWiwngyQzlR6YV0qyV1VzYnO7BJdsl8oESJqYMo0Eh9FDwxSipGG1S Mb.Gz0abZpyPmd6fQ55LnRDS47OTUELGCt9VtRwyu0j0lROAoBZYEkf4oMKs 86lKmdR6YKb3FA1c7BixWMWxG_YDgfoxi4z3w9jKEzUcct5h5rnu9fWALdIT qf5fiG4i2qgD5GJg3bz1zF34- X-Yahoo-SMTP: 9BNlx.aswBAkr0D8mG_whiOP1dyU From: "'Timothy Arceri' via Patchwork Forward" To: piglit@lists.freedesktop.org Date: Thu, 18 Jun 2015 22:59:17 +1000 Message-Id: <1434632357-3373-1-git-send-email-t_arceri@yahoo.com.au> X-Mailer: git-send-email 2.1.0 Subject: [Piglit] [PATCH] sampler_array_indexing: also check that texture coordinates work 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:c03::235 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 Previously the shaders were using a checkerboard texture with identical colours for each part of the grid. That meant that it didn't actually matter what texture coordinates were used to sample. This patch changes it so that they all have a dark red colour for one of the colours and then it ensures that the texture coordinates should sample from a space with the other colour. Test results: Nvidia GeForce 840M - NVIDIA 346.47: pass Cc: Neil Roberts --- .../fs-struct-nonconst-sampler-const.shader_test | 10 +++++----- .../fs-struct-nonconst-sampler-nonconst.shader_test | 10 +++++----- .../fs-struct-nonconst-sampler.shader_test | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/spec/arb_gpu_shader5/execution/sampler_array_indexing/fs-struct-nonconst-sampler-const.shader_test b/tests/spec/arb_gpu_shader5/execution/sampler_array_indexing/fs-struct-nonconst-sampler-const.shader_test index 16f73a4..69dbb0c 100644 --- a/tests/spec/arb_gpu_shader5/execution/sampler_array_indexing/fs-struct-nonconst-sampler-const.shader_test +++ b/tests/spec/arb_gpu_shader5/execution/sampler_array_indexing/fs-struct-nonconst-sampler-const.shader_test @@ -23,7 +23,7 @@ out vec4 color; void main() { - color = texture(s[n].tex[1], vec2(0.5, 0.5)); + color = texture(s[n].tex[1], vec2(0.75, 0.25)); } [test] @@ -35,19 +35,19 @@ uniform int s[1].tex[1] 1 uniform int s[2].tex[1] 2 uniform int s[3].tex[1] 3 -texture checkerboard 0 0 (32, 32) (1.0, 0.0, 0.0, 0.0) (1.0, 0.0, 0.0, 0.0) +texture checkerboard 0 0 (32, 32) (0.5, 0.0, 0.0, 0.0) (1.0, 0.0, 0.0, 0.0) texparameter 2D min nearest texparameter 2D mag nearest -texture checkerboard 1 0 (32, 32) (0.0, 1.0, 0.0, 0.0) (0.0, 1.0, 0.0, 0.0) +texture checkerboard 1 0 (32, 32) (0.5, 0.0, 0.0, 0.0) (0.0, 1.0, 0.0, 0.0) texparameter 2D min nearest texparameter 2D mag nearest -texture checkerboard 2 0 (32, 32) (0.0, 0.0, 1.0, 0.0) (0.0, 0.0, 1.0, 0.0) +texture checkerboard 2 0 (32, 32) (0.5, 0.0, 0.0, 0.0) (0.0, 0.0, 1.0, 0.0) texparameter 2D min nearest texparameter 2D mag nearest -texture checkerboard 3 0 (32, 32) (1.0, 1.0, 1.0, 1.0) (1.0, 1.0, 1.0, 1.0) +texture checkerboard 3 0 (32, 32) (0.5, 0.0, 0.0, 0.0) (1.0, 1.0, 1.0, 1.0) texparameter 2D min nearest texparameter 2D mag nearest diff --git a/tests/spec/arb_gpu_shader5/execution/sampler_array_indexing/fs-struct-nonconst-sampler-nonconst.shader_test b/tests/spec/arb_gpu_shader5/execution/sampler_array_indexing/fs-struct-nonconst-sampler-nonconst.shader_test index 88310ab..7368656 100644 --- a/tests/spec/arb_gpu_shader5/execution/sampler_array_indexing/fs-struct-nonconst-sampler-nonconst.shader_test +++ b/tests/spec/arb_gpu_shader5/execution/sampler_array_indexing/fs-struct-nonconst-sampler-nonconst.shader_test @@ -24,7 +24,7 @@ out vec4 color; void main() { - color = texture(s[n].tex[m], vec2(0.5, 0.5)); + color = texture(s[n].tex[m], vec2(0.75, 0.25)); } [test] @@ -36,19 +36,19 @@ uniform int s[0].tex[1] 1 uniform int s[1].tex[0] 2 uniform int s[1].tex[1] 3 -texture checkerboard 0 0 (32, 32) (1.0, 0.0, 0.0, 0.0) (1.0, 0.0, 0.0, 0.0) +texture checkerboard 0 0 (32, 32) (0.5, 0.0, 0.0, 0.0) (1.0, 0.0, 0.0, 0.0) texparameter 2D min nearest texparameter 2D mag nearest -texture checkerboard 1 0 (32, 32) (0.0, 1.0, 0.0, 0.0) (0.0, 1.0, 0.0, 0.0) +texture checkerboard 1 0 (32, 32) (0.5, 0.0, 0.0, 0.0) (0.0, 1.0, 0.0, 0.0) texparameter 2D min nearest texparameter 2D mag nearest -texture checkerboard 2 0 (32, 32) (0.0, 0.0, 1.0, 0.0) (0.0, 0.0, 1.0, 0.0) +texture checkerboard 2 0 (32, 32) (0.5, 0.0, 0.0, 0.0) (0.0, 0.0, 1.0, 0.0) texparameter 2D min nearest texparameter 2D mag nearest -texture checkerboard 3 0 (32, 32) (1.0, 1.0, 1.0, 1.0) (1.0, 1.0, 1.0, 1.0) +texture checkerboard 3 0 (32, 32) (0.5, 0.0, 0.0, 0.0) (1.0, 1.0, 1.0, 1.0) texparameter 2D min nearest texparameter 2D mag nearest diff --git a/tests/spec/arb_gpu_shader5/execution/sampler_array_indexing/fs-struct-nonconst-sampler.shader_test b/tests/spec/arb_gpu_shader5/execution/sampler_array_indexing/fs-struct-nonconst-sampler.shader_test index 9c6df15..3e3737d 100644 --- a/tests/spec/arb_gpu_shader5/execution/sampler_array_indexing/fs-struct-nonconst-sampler.shader_test +++ b/tests/spec/arb_gpu_shader5/execution/sampler_array_indexing/fs-struct-nonconst-sampler.shader_test @@ -23,7 +23,7 @@ out vec4 color; void main() { - color = texture(s[n].tex, vec2(0.5, 0.5)); + color = texture(s[n].tex, vec2(0.75, 0.25)); } [test] @@ -35,19 +35,19 @@ uniform int s[1].tex 1 uniform int s[2].tex 2 uniform int s[3].tex 3 -texture checkerboard 0 0 (32, 32) (1.0, 0.0, 0.0, 0.0) (1.0, 0.0, 0.0, 0.0) +texture checkerboard 0 0 (32, 32) (0.5, 0.0, 0.0, 0.0) (1.0, 0.0, 0.0, 0.0) texparameter 2D min nearest texparameter 2D mag nearest -texture checkerboard 1 0 (32, 32) (0.0, 1.0, 0.0, 0.0) (0.0, 1.0, 0.0, 0.0) +texture checkerboard 1 0 (32, 32) (0.5, 0.0, 0.0, 0.0) (0.0, 1.0, 0.0, 0.0) texparameter 2D min nearest texparameter 2D mag nearest -texture checkerboard 2 0 (32, 32) (0.0, 0.0, 1.0, 0.0) (0.0, 0.0, 1.0, 0.0) +texture checkerboard 2 0 (32, 32) (0.5, 0.0, 0.0, 0.0) (0.0, 0.0, 1.0, 0.0) texparameter 2D min nearest texparameter 2D mag nearest -texture checkerboard 3 0 (32, 32) (1.0, 1.0, 1.0, 1.0) (1.0, 1.0, 1.0, 1.0) +texture checkerboard 3 0 (32, 32) (0.5, 0.0, 0.0, 0.0) (1.0, 1.0, 1.0, 1.0) texparameter 2D min nearest texparameter 2D mag nearest