mirror of
https://github.com/servo/servo.git
synced 2025-06-10 09:33:13 +00:00
Auto merge of #21507 - servo:webgl, r=emilio
Update WebGL tests There is in fact nothing to update because we use upstream's snapshots from `conformance-suites/`, we should consider syncing with `sdk/tests/` instead. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21507) <!-- Reviewable:end -->
This commit is contained in:
commit
76dd6a4cdb
9 changed files with 22 additions and 15 deletions
|
@ -78066,11 +78066,11 @@
|
||||||
"support"
|
"support"
|
||||||
],
|
],
|
||||||
"webgl/conformance-1.0.3/conformance/ogles/GL/struct/nestedstructcomb_various_frag.frag": [
|
"webgl/conformance-1.0.3/conformance/ogles/GL/struct/nestedstructcomb_various_frag.frag": [
|
||||||
"dcc9d901d33b5e726688a48eb7253de9abafa626",
|
"2cc51cfb64432e3fdffbc8929432e3a3fce83dcb",
|
||||||
"support"
|
"support"
|
||||||
],
|
],
|
||||||
"webgl/conformance-1.0.3/conformance/ogles/GL/struct/nestedstructcomb_various_vert.vert": [
|
"webgl/conformance-1.0.3/conformance/ogles/GL/struct/nestedstructcomb_various_vert.vert": [
|
||||||
"459d4d81d1717887b2a09ee46f94328ba350a059",
|
"e27de221f52b98da1bd0589e9ef587237d0afb37",
|
||||||
"support"
|
"support"
|
||||||
],
|
],
|
||||||
"webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_001_to_008.html": [
|
"webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_001_to_008.html": [
|
||||||
|
@ -82618,7 +82618,7 @@
|
||||||
"support"
|
"support"
|
||||||
],
|
],
|
||||||
"webgl/conformance-2.0.0/conformance/more/unit.js": [
|
"webgl/conformance-2.0.0/conformance/more/unit.js": [
|
||||||
"a0614128f0ab91acc0aa2aa3ef6232ac5206dc2a",
|
"51433f33e84ccbd671f5fec20d961b3ac0701b3f",
|
||||||
"support"
|
"support"
|
||||||
],
|
],
|
||||||
"webgl/conformance-2.0.0/conformance/more/util.js": [
|
"webgl/conformance-2.0.0/conformance/more/util.js": [
|
||||||
|
@ -87626,11 +87626,11 @@
|
||||||
"support"
|
"support"
|
||||||
],
|
],
|
||||||
"webgl/conformance-2.0.0/conformance/ogles/GL/struct/nestedstructcomb_various_frag.frag": [
|
"webgl/conformance-2.0.0/conformance/ogles/GL/struct/nestedstructcomb_various_frag.frag": [
|
||||||
"feb6532ed406514db669bbc30d144c84d70483f3",
|
"151888a883644f8205d8bb0fe6307c903c67f3c1",
|
||||||
"support"
|
"support"
|
||||||
],
|
],
|
||||||
"webgl/conformance-2.0.0/conformance/ogles/GL/struct/nestedstructcomb_various_vert.vert": [
|
"webgl/conformance-2.0.0/conformance/ogles/GL/struct/nestedstructcomb_various_vert.vert": [
|
||||||
"a84aeb9dfa707663f0581344cdcb05fd34fcd5d1",
|
"ddc2610fdd7794df32393ffccc3d1d4de3379ae3",
|
||||||
"support"
|
"support"
|
||||||
],
|
],
|
||||||
"webgl/conformance-2.0.0/conformance/ogles/GL/struct/struct_001_to_008.html": [
|
"webgl/conformance-2.0.0/conformance/ogles/GL/struct/struct_001_to_008.html": [
|
||||||
|
@ -99166,7 +99166,7 @@
|
||||||
"testharness"
|
"testharness"
|
||||||
],
|
],
|
||||||
"webgl/tools/import-conformance-tests.py": [
|
"webgl/tools/import-conformance-tests.py": [
|
||||||
"970c36cecac1e391866040b77a0cea91154e6084",
|
"55e183f9a5b2269ec75345786039cdb7f1106c0b",
|
||||||
"support"
|
"support"
|
||||||
],
|
],
|
||||||
"webgl/tools/js-test-pre.patch": [
|
"webgl/tools/js-test-pre.patch": [
|
||||||
|
@ -99178,7 +99178,7 @@
|
||||||
"support"
|
"support"
|
||||||
],
|
],
|
||||||
"webgl/tools/timeout.patch": [
|
"webgl/tools/timeout.patch": [
|
||||||
"7c20e5daba640a57aeb5cd8089de721a85f6d70c",
|
"fe3e3c877f3d24d103b30486c20d55467ee844f9",
|
||||||
"support"
|
"support"
|
||||||
],
|
],
|
||||||
"webgl/tools/unit.patch": [
|
"webgl/tools/unit.patch": [
|
||||||
|
@ -99186,7 +99186,7 @@
|
||||||
"support"
|
"support"
|
||||||
],
|
],
|
||||||
"webgl/tools/unit2.patch": [
|
"webgl/tools/unit2.patch": [
|
||||||
"c54efb4975bd7e7bac1db0a072e7b7303bc2a0cc",
|
"7678d4ae72ab17d623126db2fe192d48ba69948e",
|
||||||
"support"
|
"support"
|
||||||
],
|
],
|
||||||
"webgl/uniformMatrixNfv.html": [
|
"webgl/uniformMatrixNfv.html": [
|
||||||
|
|
|
@ -28,7 +28,7 @@ precision mediump float;
|
||||||
#endif
|
#endif
|
||||||
varying vec4 color;
|
varying vec4 color;
|
||||||
|
|
||||||
#define ERROR_EPSILON 0.1
|
#define ERROR_EPSILON 0.125
|
||||||
|
|
||||||
void main (void){
|
void main (void){
|
||||||
struct second_nest
|
struct second_nest
|
||||||
|
|
|
@ -27,7 +27,7 @@ attribute vec4 gtf_Vertex;
|
||||||
uniform mat4 gtf_ModelViewProjectionMatrix;
|
uniform mat4 gtf_ModelViewProjectionMatrix;
|
||||||
varying vec4 color;
|
varying vec4 color;
|
||||||
|
|
||||||
#define ERROR_EPSILON 0.1
|
#define ERROR_EPSILON 0.125
|
||||||
|
|
||||||
void main (void)
|
void main (void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -53,6 +53,10 @@ if (window.internals) {
|
||||||
window.internals.settings.setWebGLErrorsToConsoleEnabled(false);
|
window.internals.settings.setWebGLErrorsToConsoleEnabled(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (window.async_test) {
|
||||||
|
var __overall_test = async_test('Overall test');
|
||||||
|
}
|
||||||
|
|
||||||
/* -- end platform specific code --*/
|
/* -- end platform specific code --*/
|
||||||
Tests = {
|
Tests = {
|
||||||
autorun : true,
|
autorun : true,
|
||||||
|
@ -949,6 +953,9 @@ function notifyFinishedToHarness() {
|
||||||
if (window.parent.webglTestHarness) {
|
if (window.parent.webglTestHarness) {
|
||||||
window.parent.webglTestHarness.notifyFinished(window.location.pathname);
|
window.parent.webglTestHarness.notifyFinished(window.location.pathname);
|
||||||
}
|
}
|
||||||
|
if (window.__overall_test) {
|
||||||
|
window.__overall_test.done();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function initTests() {
|
function initTests() {
|
||||||
|
|
|
@ -28,7 +28,7 @@ precision mediump float;
|
||||||
#endif
|
#endif
|
||||||
varying vec4 color;
|
varying vec4 color;
|
||||||
|
|
||||||
#define ERROR_EPSILON 0.1
|
#define ERROR_EPSILON 0.125
|
||||||
|
|
||||||
void main (void){
|
void main (void){
|
||||||
struct second_nest
|
struct second_nest
|
||||||
|
|
|
@ -27,7 +27,7 @@ attribute vec4 gtf_Vertex;
|
||||||
uniform mat4 gtf_ModelViewProjectionMatrix;
|
uniform mat4 gtf_ModelViewProjectionMatrix;
|
||||||
varying vec4 color;
|
varying vec4 color;
|
||||||
|
|
||||||
#define ERROR_EPSILON 0.1
|
#define ERROR_EPSILON 0.125
|
||||||
|
|
||||||
void main (void)
|
void main (void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -19,7 +19,7 @@ PATCHES_1X = [
|
||||||
# Patches for conformance tests 2.0.x
|
# Patches for conformance tests 2.0.x
|
||||||
PATCHES_2X = [
|
PATCHES_2X = [
|
||||||
("js-test-pre2.patch", "js/js-test-pre.js"),
|
("js-test-pre2.patch", "js/js-test-pre.js"),
|
||||||
("unit.patch", "conformance/more/unit.js")
|
("unit.patch", "conformance/more/unit.js"),
|
||||||
("unit2.patch", "conformance/more/unit.js")
|
("unit2.patch", "conformance/more/unit.js")
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -117,4 +117,4 @@ index c1542f4fa9..b3ee786e0b 100644
|
||||||
+<meta name="timeout" content="long">
|
+<meta name="timeout" content="long">
|
||||||
<link rel="stylesheet" href="../../resources/js-test-style.css"/>
|
<link rel="stylesheet" href="../../resources/js-test-style.css"/>
|
||||||
<script src=/resources/testharness.js></script>
|
<script src=/resources/testharness.js></script>
|
||||||
<script src=/resources/testharnessreport.js></script>
|
<script src=/resources/testharnessreport.js></script>
|
||||||
|
|
|
@ -22,4 +22,4 @@ index 742f8d7b9d..428c164699 100644
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
|
|
||||||
function initTests() {
|
function initTests() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue