summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--o3d/tests/selenium/javascript_unit_test_list.txt4
-rw-r--r--o3d/tests/selenium/tests/texture-set-test.html9
2 files changed, 7 insertions, 6 deletions
diff --git a/o3d/tests/selenium/javascript_unit_test_list.txt b/o3d/tests/selenium/javascript_unit_test_list.txt
index 090ffe2..f73c951 100644
--- a/o3d/tests/selenium/javascript_unit_test_list.txt
+++ b/o3d/tests/selenium/javascript_unit_test_list.txt
@@ -70,8 +70,8 @@ small base-test
small util-test
small pixel-perfection screenshot pdiff_threshold(2500) pdiff_threshold_mac(3000) except(*iexplore)
medium offscreen-test
-# TODO Temporarily removing until its fixed on mac
-#medium texture-set-test screenshot
+medium texture-set-test screenshot
+#medium param-array-test screenshot
small no-rendergraph screenshot
small non-cachable-params screenshot pdiff_threshold(1700)
small type-test
diff --git a/o3d/tests/selenium/tests/texture-set-test.html b/o3d/tests/selenium/tests/texture-set-test.html
index a58d024..a421e5f 100644
--- a/o3d/tests/selenium/tests/texture-set-test.html
+++ b/o3d/tests/selenium/tests/texture-set-test.html
@@ -92,11 +92,12 @@ function initStep2(clientElements) {
var clientWidth = g_client.width;
var clientHeight = g_client.height;
+ // The + 0.5 makes this pixel aligned.
g_viewInfo.drawContext.projection = g_math.matrix4.orthographic(
- -clientWidth * 0.5,
- clientWidth * 0.5,
- -clientHeight * 0.5,
- clientHeight * 0.5,
+ -clientWidth * 0.5 + 0.5,
+ clientWidth * 0.5 + 0.5,
+ -clientHeight * 0.5 + 0.5,
+ clientHeight * 0.5 + 0.5,
0.001,
1000);
g_viewInfo.drawContext.view = g_math.matrix4.lookAt(