diff mbox

[Branch,~afrantzis/glmark2/trunk] Rev 99: Fix typo in Canvas::height() and adjust validation reference values.

Message ID 20110706101316.16906.38765.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

alexandros.frantzis@linaro.org July 6, 2011, 10:13 a.m. UTC 
------------------------------------------------------------
revno: 99
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
branch nick: trunk
timestamp: Tue 2011-07-05 16:45:41 +0300
message:
  Fix typo in Canvas::height() and adjust validation reference values.
modified:
  src/canvas.h
  src/scene-build.cpp
  src/scene-shading.cpp
  src/scene-texture.cpp


--
lp:glmark2
https://code.launchpad.net/~afrantzis/glmark2/trunk

You are subscribed to branch lp:glmark2.
To unsubscribe from this branch go to https://code.launchpad.net/~afrantzis/glmark2/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'src/canvas.h'
--- src/canvas.h	2011-06-30 13:39:21 +0000
+++ src/canvas.h	2011-07-05 13:45:41 +0000
@@ -76,7 +76,7 @@ 
     }
 
     int width() { return mWidth; }
-    int height() { return mWidth; }
+    int height() { return mHeight; }
     const LibMatrix::mat4 &projection() { return mProjection; }
 
 protected:

=== modified file 'src/scene-build.cpp'
--- src/scene-build.cpp	2011-07-04 10:46:22 +0000
+++ src/scene-build.cpp	2011-07-05 13:45:41 +0000
@@ -182,7 +182,7 @@ 
     if (mRotation != 0)
         return Scene::ValidationUnknown;
 
-    Canvas::Pixel ref(0xcf, 0xcf, 0xcf, 0xff);
+    Canvas::Pixel ref(0xa7, 0xa7, 0xa7, 0xff);
     Canvas::Pixel pixel = mCanvas.read_pixel(mCanvas.width() / 2,
                                              mCanvas.height() / 2);
 

=== modified file 'src/scene-shading.cpp'
--- src/scene-shading.cpp	2011-07-04 10:46:22 +0000
+++ src/scene-shading.cpp	2011-07-05 13:45:41 +0000
@@ -198,9 +198,9 @@ 
     const std::string &filter = mOptions["shading"].value;
 
     if (filter == "gouraud")
-        ref = Canvas::Pixel(0x00, 0x00, 0x76, 0xff);
+        ref = Canvas::Pixel(0x00, 0x00, 0x2d, 0xff);
     else if (filter == "phong")
-        ref = Canvas::Pixel(0x1a, 0x1a, 0x79, 0xff);
+        ref = Canvas::Pixel(0x1a, 0x1a, 0x3e, 0xff);
     else
         return Scene::ValidationUnknown;
 

=== modified file 'src/scene-texture.cpp'
--- src/scene-texture.cpp	2011-07-04 10:46:22 +0000
+++ src/scene-texture.cpp	2011-07-05 13:45:41 +0000
@@ -188,17 +188,17 @@ 
 
     Canvas::Pixel ref;
 
-    Canvas::Pixel pixel = mCanvas.read_pixel(mCanvas.width() / 2 - 3,
-                                             mCanvas.height() / 2 - 3);
+    Canvas::Pixel pixel = mCanvas.read_pixel(mCanvas.width() / 2 + 3,
+                                             mCanvas.height() / 2 + 3);
 
     const std::string &filter = mOptions["texture-filter"].value;
 
     if (filter == "nearest")
-        ref = Canvas::Pixel(0x24, 0x22, 0x23, 0xff);
+        ref = Canvas::Pixel(0x3b, 0x3a, 0x39, 0xff);
     else if (filter == "linear")
-        ref = Canvas::Pixel(0x29, 0x27, 0x28, 0xff);
+        ref = Canvas::Pixel(0x36, 0x36, 0x34, 0xff);
     else if (filter == "mipmap")
-        ref = Canvas::Pixel(0x2c, 0x2a, 0x2b, 0xff);
+        ref = Canvas::Pixel(0x35, 0x35, 0x34, 0xff);
     else
         return Scene::ValidationUnknown;