diff mbox

[Branch,~glmark2-dev/glmark2/trunk] Rev 144: SceneShading: Fix validation check for phong shading.

Message ID 20110922105216.18991.49394.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

alexandros.frantzis@linaro.org Sept. 22, 2011, 10:52 a.m. UTC 
------------------------------------------------------------
revno: 144
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
branch nick: trunk
timestamp: Wed 2011-09-21 17:29:29 +0300
message:
  SceneShading: Fix validation check for phong shading.
modified:
  src/scene-shading.cpp


--
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
diff mbox

Patch

=== modified file 'src/scene-shading.cpp'
--- src/scene-shading.cpp	2011-09-14 08:39:16 +0000
+++ src/scene-shading.cpp	2011-09-21 14:29:29 +0000
@@ -275,8 +275,8 @@ 
         ref = Canvas::Pixel(0x00, 0x00, 0x2d, 0xff);
     else if (filter == "blinn-phong-inf")
         ref = Canvas::Pixel(0x1a, 0x1a, 0x3e, 0xff);
-    else if (filter == "phong")
-        ref = Canvas::Pixel(0x1a, 0x1a, 0x53, 0xff);
+    else if (filter == "phong" && mOptions["num-lights"].value == "1")
+        ref = Canvas::Pixel(0x05, 0x05, 0xad, 0xff);
     else
         return Scene::ValidationUnknown;