diff options
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/DEPS | 2 | ||||
| -rw-r--r-- | o3d/samples/generate-texture.html | 14 | ||||
| -rw-r--r-- | o3d/tests/selenium/sample_list.txt | 2 |
3 files changed, 16 insertions, 2 deletions
@@ -2,7 +2,7 @@ vars = { "chromium_trunk": "http://src.chromium.org/svn/trunk", "nixysa_rev": "28", - "o3d_code_rev": "98", + "o3d_code_rev": "100", } deps = { diff --git a/o3d/samples/generate-texture.html b/o3d/samples/generate-texture.html index b4ff612..b910af3 100644 --- a/o3d/samples/generate-texture.html +++ b/o3d/samples/generate-texture.html @@ -55,6 +55,7 @@ var g_client; var g_pack; var g_viewInfo; var g_finished = false; // for selenium testing +var g_samplers = []; /** * Creates the client area. @@ -160,6 +161,7 @@ function initStep2(clientElements) { samplerParam.value = sampler; sampler.addressModeU = g_o3d.Sampler.CLAMP; sampler.addressModeV = g_o3d.Sampler.CLAMP; + g_samplers[s] = sampler; // Create a texture. { @@ -269,9 +271,21 @@ function initStep2(clientElements) { sampler.texture = texture; } } + window.o3d_prepForSelenium = prepForSelenium; window.g_finished = true; // for selenium testing. } +// Turn off all filtering in the samplers to get consistent testing +// results. +function prepForSelenium() { + for (var i = 0; i < g_samplers.length; i++) { + g_samplers[i].magFilter = g_o3d.Sampler.POINT; + g_samplers[i].minFilter = g_o3d.Sampler.POINT; + g_samplers[i].mipFilter = g_o3d.Sampler.NONE; + } +} + + </script> </head> <body onload="init()"> diff --git a/o3d/tests/selenium/sample_list.txt b/o3d/tests/selenium/sample_list.txt index 5acb997..67e77f1 100644 --- a/o3d/tests/selenium/sample_list.txt +++ b/o3d/tests/selenium/sample_list.txt @@ -72,7 +72,7 @@ # http://wiki.corp.google.com/twiki/bin/view/Main/ClientThreeDSampleGuidelines # # -medium 2d screenshot pdiff_threshold(200) colorfactor(0.8) +medium 2d screenshot pdiff_threshold(200) pdiff_threshold_mac(41200) colorfactor(0.8) medium animation large animated-scene screenshot timeout(45000) pdiff_threshold(200) large beachdemo/beachdemo screenshot timeout(120000) pdiff_threshold(200) pdiff_threshold_mac(2100) downsample(1) except(*iexplore, *googlechrome) |