mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
fdd5a3844c
No review because this is mostly just syncing us with the upstream, https://cvs.khronos.org/svn/repos/registry/trunk/public/webgl/sdk/tests/ as well as adjusting to test harness changes (now loading test lists asynchronously) and a patch to the harness itself which I'll send upstream (see fix-webgl-harness-async.patch)
49 lines
2.0 KiB
Diff
49 lines
2.0 KiB
Diff
# HG changeset patch
|
|
# Parent efec656cc42addae5aa96c6691031d54d46436fe
|
|
diff --git a/content/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html b/content/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html
|
|
--- a/content/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html
|
|
+++ b/content/canvas/test/webgl/conformance/extensions/oes-standard-derivatives.html
|
|
@@ -115,17 +115,18 @@ if (!gl) {
|
|
} else {
|
|
testPassed("Successfully enabled OES_standard_derivatives extension");
|
|
|
|
runSupportedTest(true);
|
|
|
|
runHintTestEnabled();
|
|
runShaderTests(true);
|
|
runOutputTests();
|
|
- runUniqueObjectTest();
|
|
+ // similar to bug 683216, see the discussion in bug 630672
|
|
+ // runUniqueObjectTest();
|
|
}
|
|
}
|
|
|
|
function runSupportedTest(extensionEnabled) {
|
|
var supported = gl.getSupportedExtensions();
|
|
if (supported.indexOf("OES_standard_derivatives") >= 0) {
|
|
if (extensionEnabled) {
|
|
testPassed("OES_standard_derivatives listed as supported and getExtension succeeded");
|
|
diff --git a/content/canvas/test/webgl/conformance/extensions/oes-texture-float.html b/content/canvas/test/webgl/conformance/extensions/oes-texture-float.html
|
|
--- a/content/canvas/test/webgl/conformance/extensions/oes-texture-float.html
|
|
+++ b/content/canvas/test/webgl/conformance/extensions/oes-texture-float.html
|
|
@@ -80,17 +80,18 @@ if (!gl) {
|
|
runTextureCreationTest(testProgram, false);
|
|
|
|
if (!gl.getExtension("OES_texture_float")) {
|
|
testPassed("No OES_texture_float support -- this is legal");
|
|
} else {
|
|
testPassed("Successfully enabled OES_texture_float extension");
|
|
runTextureCreationTest(testProgram, true);
|
|
runRenderTargetTest(testProgram);
|
|
- runUniqueObjectTest();
|
|
+ // bug 683216, see the discussion in bug 630672
|
|
+ // runUniqueObjectTest();
|
|
}
|
|
}
|
|
|
|
// Needs to be global for shouldBe to see it.
|
|
var pixels;
|
|
|
|
function allocateTexture()
|
|
{
|