From patchwork Fri Dec 21 19:56:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barker X-Patchwork-Id: 13683 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 2CB4924141 for ; Fri, 21 Dec 2012 19:56:15 +0000 (UTC) Received: from mail-ie0-f171.google.com (mail-ie0-f171.google.com [209.85.223.171]) by fiordland.canonical.com (Postfix) with ESMTP id CA67AA18444 for ; Fri, 21 Dec 2012 19:56:14 +0000 (UTC) Received: by mail-ie0-f171.google.com with SMTP id 17so6794214iea.2 for ; Fri, 21 Dec 2012 11:56:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:content-type:mime-version:x-launchpad-project :x-launchpad-branch:x-launchpad-message-rationale :x-launchpad-branch-revision-number:x-launchpad-notification-type:to :from:subject:message-id:date:reply-to:sender:errors-to:precedence :x-generated-by:x-launchpad-hash:x-gm-message-state; bh=WaXLzg7Ftd2UkxLCCFVQc5Y3ClDucBKDijiiF0rY96Y=; b=MhjyI8g1OQpEvbTTnbcFViNfZk0BUNjJ3FdiMV/oCWaht9A7W1pljqZj7jslGkxIU7 126WTP1TvNSRhDEBocARTucbx4HGFtG/N5MwqygnhL/ZOzbmsfP/EYNwhwdhkezaAK8E Z+C13vLaUOBTMwT3UQJSeHnB0NXl46Wae2DbajQhrIUfSLvRPn3AOXCRQSo2Xm8JPsbJ hWLzGOV6CAwSXQ2eBEkFLMDJHE21InC3wAm5Hcz+DRwEQFJDqSqwd6wN1QkPGeQP19gA YW741CVspQmCR6vaVDSUjeaPVsRgmdyyJCKon6RTGShDiiNrICrk8LdbUoX12K0yI/hC j1Mg== X-Received: by 10.43.92.72 with SMTP id bp8mr12597514icc.49.1356119774254; Fri, 21 Dec 2012 11:56:14 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.115 with SMTP id m19csp135368igt; Fri, 21 Dec 2012 11:56:13 -0800 (PST) X-Received: by 10.194.236.68 with SMTP id us4mr25807372wjc.11.1356119772847; Fri, 21 Dec 2012 11:56:12 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id o10si20988210wic.16.2012.12.21.11.56.12 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Dec 2012 11:56:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Tm8hY-0000YD-8O for ; Fri, 21 Dec 2012 19:56:12 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 23ABEE012D for ; Fri, 21 Dec 2012 19:56:12 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glmark2 X-Launchpad-Branch: ~glmark2-dev/glmark2/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 259 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 259: SceneRefract: The GLSL [ES] built-in 'refract()' expects a ratio of refractive Message-Id: <20121221195612.28689.99907.launchpad@ackee.canonical.com> Date: Fri, 21 Dec 2012 19:56:12 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="16378"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 7702375784ab866cac91d1feb4002cfa79c7bfd4 X-Gm-Message-State: ALoCoQk2a+00NZIBrsYrQFcnQ3yr3eYCLcShIGcHoPiSWsaW8XURhJb7eoEOYEmZk6yNicCpkeku ------------------------------------------------------------ revno: 259 committer: Jesse Barker branch nick: trunk timestamp: Fri 2012-12-21 11:54:32 -0800 message: SceneRefract: The GLSL [ES] built-in 'refract()' expects a ratio of refractive indices, so make the back interface value a reciprocal of the front. modified: data/shaders/light-refract.frag --- lp:glmark2 https://code.launchpad.net/~glmark2-dev/glmark2/trunk You are subscribed to branch lp:glmark2. To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription === modified file 'data/shaders/light-refract.frag' --- data/shaders/light-refract.frag 2012-12-14 00:06:17 +0000 +++ data/shaders/light-refract.frag 2012-12-21 19:54:32 +0000 @@ -29,7 +29,7 @@ // object. vec2 normcoord = back_position.st * point_five + point_five; vec3 back_normal = texture2D(NormalMap, normcoord).xyz; - vec3 back_refraction = refract(back_position, back_normal, 1.0); + vec3 back_refraction = refract(back_position, back_normal, 1.0/RefractiveIndex); // Use the transmitted vector from the exit point to determine where // the vector would intersect the environment (in this case a background // image.