Skip to content

Commit

Permalink
Update WebGL conformance test suite 2022-09-23
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=245572
rdar://problem/100319850

Reviewed by Antti Koivisto.

To upstream commit 0018764891fcd5dbc5bd88cc6b5d9444b8a316f6

* LayoutTests/http/tests/webgl/1.0.x/conformance/more/functions/readPixelsBadArgs-expected.txt:
* LayoutTests/http/tests/webgl/1.0.x/conformance/textures/misc/origin-clean-conformance-expected.txt:
* LayoutTests/http/tests/webgl/1.0.x/conformance/textures/misc/origin-clean-conformance-offscreencanvas-expected.txt:
* LayoutTests/http/tests/webgl/2.0.y/conformance/more/functions/readPixelsBadArgs-expected.txt:
* LayoutTests/http/tests/webgl/2.0.y/conformance/textures/misc/origin-clean-conformance-expected.txt:
* LayoutTests/http/tests/webgl/2.0.y/conformance/textures/misc/origin-clean-conformance-offscreencanvas-expected.txt:
* LayoutTests/http/tests/webgl/2.0.y/conformance2/textures/misc/origin-clean-conformance-offscreencanvas-expected.txt:
* LayoutTests/http/tests/webgl/resources/js-test-pre.js:
(debug):
(testPassed):
* LayoutTests/http/tests/webgl/resources/webgl_test_files/js/js-test-post.js:
* LayoutTests/http/tests/webgl/resources/webgl_test_files/js/js-test-pre.js:
(reportTestResultsToHarness):
(reportSkippedTestResultsToHarness):
(notifyFinishedToHarness):
(testPassedOptions):
(testSkippedOptions):
* LayoutTests/http/tests/webgl/resources/webgl_test_files/js/webgl-test-utils.js:
(create3DContext):
(namedColorInColorSpace):
(colorAsSampledWithInternalFormat):
(WebGLTestUtils):
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_matrix_combine-expected.txt: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_matrix_combine.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_matrix_to_matrix-expected.txt: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_matrix_to_matrix.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_scalar_to_matrix-expected.txt: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_scalar_to_matrix.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_scalar_to_scalar-expected.txt: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_scalar_to_scalar.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_scalar_to_vector-expected.txt: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_scalar_to_vector.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_vector_combine-expected.txt: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_vector_combine.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_vector_illegal-expected.txt: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_vector_illegal.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_vector_to_scalar-expected.txt: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_vector_to_scalar.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_vector_to_vector-expected.txt: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions_vector_to_vector.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_bvec2-expected.txt: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_bvec2.html: Renamed from LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_bvec3-expected.txt: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_bvec3.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_bvec4-expected.txt: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_bvec4.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_ivec2-expected.txt: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_ivec2.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_ivec3-expected.txt: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_ivec3.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_ivec4-expected.txt: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_ivec4.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_vec2-expected.txt: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_vec2.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_vec3-expected.txt: Renamed from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_vec3.html: Renamed from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles.html.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_vec4-expected.txt: Renamed from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions-expected.txt.
* LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/swizzles_vec4.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_bvec2-expected.txt: Copied from LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles-expected.txt.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_bvec2.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_bvec3-expected.txt: Copied from LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles-expected.txt.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_bvec3.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_bvec4-expected.txt: Copied from LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles-expected.txt.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_bvec4.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_ivec2-expected.txt: Copied from LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles-expected.txt.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_ivec2.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_ivec3-expected.txt: Copied from LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles-expected.txt.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_ivec3.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_ivec4-expected.txt: Copied from LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles-expected.txt.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_ivec4.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_vec2-expected.txt: Copied from LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles-expected.txt.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_vec2.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_vec3-expected.txt: Copied from LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles-expected.txt.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_vec3.html: Copied from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_vec4-expected.txt: Renamed from LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles-expected.txt.
* LayoutTests/webgl/2.0.y/deqp/data/gles3/shaders/swizzles_vec4.html: Renamed from LayoutTests/webgl/1.0.x/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/conformance/extensions/ext-texture-compression-rgtc.html:
* LayoutTests/webgl/resources/webgl_test_files/conformance/reading/read-pixels-test.html:
* LayoutTests/webgl/resources/webgl_test_files/conformance/textures/misc/texture-video-transparent.html:
* LayoutTests/webgl/resources/webgl_test_files/conformance2/buffers/get-buffer-sub-data.html:
* LayoutTests/webgl/resources/webgl_test_files/conformance2/extensions/ext-provoking-vertex.html: Added.
* LayoutTests/webgl/resources/webgl_test_files/conformance2/textures/misc/tex-new-formats.html:
* LayoutTests/webgl/resources/webgl_test_files/conformance2/transform_feedback/simultaneous_binding.html:
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.template: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_matrix_combine.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_matrix_combine.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_matrix_to_matrix.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_matrix_to_matrix.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_matrix.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_matrix.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_scalar.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_scalar.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_vector.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_vector.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_vector_combine.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_vector_combine.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_vector_illegal.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_vector_illegal.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_vector_to_scalar.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_vector_to_scalar.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_vector_to_vector.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions_vector_to_vector.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/split-conversions.js: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/split-swizzles.js: Added.
(cases.of.Object.entries):
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles.template: Renamed from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_bvec2.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_bvec2.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_bvec3.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_bvec3.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_bvec4.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_bvec4.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_ivec2.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_ivec2.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_ivec3.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_ivec3.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_ivec4.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_ivec4.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_vec2.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_vec2.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_vec3.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_vec3.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_vec4.html: Renamed from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/conversions.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles2/shaders/swizzles_vec4.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/split-swizzles.js: Added.
(cases.of.Object.entries):
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles.template: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_bvec2.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_bvec2.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_bvec3.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_bvec3.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_bvec4.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_bvec4.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_ivec2.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_ivec2.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_ivec3.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_ivec3.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_ivec4.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_ivec4.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_vec2.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_vec2.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_vec3.html: Copied from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_vec3.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_vec4.html: Renamed from LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles.html.
* LayoutTests/webgl/resources/webgl_test_files/deqp/data/gles3/shaders/swizzles_vec4.test: Added.
* LayoutTests/webgl/resources/webgl_test_files/js/js-test-pre.js:
(reportTestResultsToHarness):
(reportSkippedTestResultsToHarness):
(notifyFinishedToHarness):
(testPassedOptions):
(testSkippedOptions):
* LayoutTests/webgl/resources/webgl_test_files/js/tests/canvas-tests-utils.js:
(testAPIs):
* LayoutTests/webgl/resources/webgl_test_files/resources/transparent-2frames.mp4: Added.

Canonical link: https://commits.webkit.org/255159@main
  • Loading branch information
kkinnunen-apple committed Oct 5, 2022
1 parent 78561c1 commit d5ab79c
Show file tree
Hide file tree
Showing 128 changed files with 23,296 additions and 52 deletions.
4 changes: 2 additions & 2 deletions LayoutTests/http/tests/webgl/resources/js-test-pre.js
Expand Up @@ -128,7 +128,7 @@ function debug(msg)
{
_addSpan(msg);
if (_jsTestPreVerboseLogging) {
_logToConsole(msg);
_logToConsole(msg);
}
}

Expand All @@ -142,7 +142,7 @@ function testPassed(msg)
reportTestResultsToHarness(true, msg);
_addSpan('<span><span class="pass">PASS</span> ' + escapeHTML(msg) + '</span>');
if (_jsTestPreVerboseLogging) {
_logToConsole('PASS ' + msg);
_logToConsole('PASS ' + msg);
}
}

Expand Down
Expand Up @@ -15,6 +15,17 @@ if (_jsTestPreVerboseLogging) {
let fails_class = 'pass';
if (RESULTS.fail) {
fails_class = 'fail';
} else {
const parseBoolean = v => v.toLowerCase().startsWith('t') || parseFloat(v) > 0;
const params = new URLSearchParams(window.location.search);
if (parseBoolean(params.get('runUntilFail') || '')) {
setTimeout(() => {
params.set('runCount', parseInt(params.get('runCount') || '0') + 1);
const url = new URL(window.location.href);
url.search = params.toString();
window.location.href = url.toString();
}, 100);
}
}
e_results.classList.add('pass');
e_results.innerHTML = `<p>TEST COMPLETE: ${RESULTS.pass} PASS, ` +
Expand Down
Expand Up @@ -93,20 +93,25 @@ const RESULTS = {
fail: 0,
};

// We cache these values since they will potentially be accessed many (100k+)
// times and accessing window can be significantly slower than a local variable.
const locationPathname = window.location.pathname;
const webglTestHarness = window.parent.webglTestHarness;

function reportTestResultsToHarness(success, msg) {
if (success) {
RESULTS.pass += 1;
} else {
RESULTS.fail += 1;
}
if (window.parent.webglTestHarness) {
window.parent.webglTestHarness.reportResults(window.location.pathname, success, msg);
if (webglTestHarness) {
webglTestHarness.reportResults(locationPathname, success, msg);
}
}

function reportSkippedTestResultsToHarness(success, msg) {
if (window.parent.webglTestHarness) {
window.parent.webglTestHarness.reportResults(window.location.pathname, success, msg, true);
if (webglTestHarness) {
webglTestHarness.reportResults(locationPathname, success, msg, true);
}
}

Expand All @@ -116,8 +121,8 @@ function notifyFinishedToHarness() {
}
window._didNotifyFinishedToHarness = true;

if (window.parent.webglTestHarness) {
window.parent.webglTestHarness.notifyFinished(window.location.pathname);
if (webglTestHarness) {
webglTestHarness.notifyFinished(locationPathname);
}
if (window.nonKhronosFrameworkNotifyDone) {
window.nonKhronosFrameworkNotifyDone();
Expand Down Expand Up @@ -268,9 +273,9 @@ function getCurrentTestName()
*/
function testPassedOptions(msg, addSpan)
{
reportTestResultsToHarness(true, _currentTestName + ": " + msg);
if (addSpan && !quietMode())
{
reportTestResultsToHarness(true, _currentTestName + ": " + msg);
_addSpan('<span><span class="pass">PASS</span> ' + escapeHTML(_currentTestName) + ": " + escapeHTML(msg) + '</span>');
}
if (_jsTestPreVerboseLogging) {
Expand All @@ -285,9 +290,9 @@ function testPassedOptions(msg, addSpan)
*/
function testSkippedOptions(msg, addSpan)
{
reportSkippedTestResultsToHarness(true, _currentTestName + ": " + msg);
if (addSpan && !quietMode())
{
reportSkippedTestResultsToHarness(true, _currentTestName + ": " + msg);
_addSpan('<span><span class="warn">SKIP</span> ' + escapeHTML(_currentTestName) + ": " + escapeHTML(msg) + '</span>');
}
if (_jsTestPreVerboseLogging) {
Expand Down
Expand Up @@ -1573,6 +1573,29 @@ var create3DContext = function(opt_canvas, opt_attributes, opt_version) {
if (!hasAttributeCaseInsensitive(attributes, "antialias")) {
attributes.antialias = false;
}

const parseString = v => v;
const parseBoolean = v => v.toLowerCase().startsWith('t') || parseFloat(v) > 0;
const params = new URLSearchParams(window.location.search);
for (const [key, parseFn] of Object.entries({
alpha: parseBoolean,
antialias: parseBoolean,
depth: parseBoolean,
desynchronized: parseBoolean,
failIfMajorPerformanceCaveat: parseBoolean,
powerPreference: parseString,
premultipliedAlpha: parseBoolean,
preserveDrawingBuffer: parseBoolean,
stencil: parseBoolean,
})) {
const value = params.get(key);
if (value) {
const v = parseFn(value);
attributes[key] = v;
debug(`setting context attribute: ${key} = ${v}`);
}
}

if (!opt_version) {
opt_version = getDefault3DContextVersion();
}
Expand Down Expand Up @@ -1607,6 +1630,12 @@ var create3DContext = function(opt_canvas, opt_attributes, opt_version) {
}
window._wtu_contexts.push(context);
}

if (params.get('showRenderer')) {
const ext = context.getExtension('WEBGL_debug_renderer_info');
debug(`RENDERER: ${context.getParameter(ext ? ext.UNMASKED_RENDERER_WEBGL : context.RENDERER)}`);
}

return context;
};

Expand Down Expand Up @@ -3296,6 +3325,98 @@ function linearChannelToSRGB(value) {
return Math.trunc(value * 255 + 0.5);
}

/**
* Return the named color in the specified color space.
* @param {string} colorName The name of the color to convert.
* Supported color names are:
* 'Red', which is the CSS color color('srgb' 1 0 0 1)
* 'Green', which is the CSS color color('srgb' 0 1 0 1)
* @param {string} colorSpace The color space to convert to. Supported
color spaces are:
* null, which is treated as sRGB
* 'srgb'
* 'display-p3'.
* Documentation on the formulas for color conversion between
* spaces can be found at
https://www.w3.org/TR/css-color-4/#predefined-to-predefined
* @return {!Array.<number>} color The color in the specified color
* space as an 8-bit RGBA array with unpremultiplied alpha.
*/
var namedColorInColorSpace = function(colorName, colorSpace) {
var result;
switch (colorSpace) {
case undefined:
case 'srgb':
switch(colorName) {
case 'Red':
return [255, 0, 0, 255];
case 'Green':
return [0, 255, 0, 255];
break;
default:
throw 'unexpected color name: ' + colorName;
};
break;
case 'display-p3':
switch(colorName) {
case 'Red':
return [234, 51, 35, 255];
break;
case 'Green':
return [117, 251, 76, 255];
break;
default:
throw 'unexpected color name: ' + colorName;
}
break;
default:
throw 'unexpected color space: ' + colorSpace;
}
}

/**
* Return the named color as it would be sampled with the specified
* internal format
* @param {!Array.<number>} color The color as an 8-bit RGBA array.
* @param {string} internalformat The internal format.
* @return {!Array.<number>} color The color, as it would be sampled by
* the specified internal format, as an 8-bit RGBA array.
*/
var colorAsSampledWithInternalFormat = function(color, internalFormat) {
switch (internalFormat) {
case 'ALPHA':
return [0, 0, 0, color[3]];
case 'LUMINANCE':
return [color[0], color[0], color[0], 255];
case 'LUMINANCE_ALPHA':
return [color[0], color[0], color[0], color[3]];
case 'SRGB8':
case 'SRGB8_ALPHA8':
return [sRGBChannelToLinear(color[0]),
sRGBChannelToLinear(color[1]),
sRGBChannelToLinear(color[2]),
color[3]];
case 'R16F':
case 'R32F':
case 'R8':
case 'R8UI':
case 'RED':
case 'RED_INTEGER':
return [color[0], 0, 0, 0];
case 'RG':
case 'RG16F':
case 'RG32F':
case 'RG8':
case 'RG8UI':
case 'RG_INTEGER':
return [color[0], color[1], 0, 0];
break;
default:
break;
}
return color;
}

function comparePixels(cmp, ref, tolerance, diff) {
if (cmp.length != ref.length) {
testFailed("invalid pixel size.");
Expand Down Expand Up @@ -3516,6 +3637,10 @@ var API = {
// fullscreen api
setupFullscreen: setupFullscreen,

// color converter API
namedColorInColorSpace: namedColorInColorSpace,
colorAsSampledWithInternalFormat: colorAsSampledWithInternalFormat,

// sRGB converter api
sRGBToLinear: sRGBToLinear,
linearToSRGB: linearToSRGB,
Expand Down
@@ -0,0 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.

Test: ../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_matrix_combine.html
[ PASS ] All tests passed
@@ -0,0 +1,18 @@
<!-- This file is auto-generated by Tools/Scripts/update-webgl-conformance-tests. DO NOT EDIT -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>WebGL Conformance Test Wrapper for conversions_matrix_combine.html</title>
<script type="text/javascript" src="../../../../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="../../../../../resources/webkit-webgl-test-harness.js"></script>
</head>
<body>
<p>This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.</p>
Test: <a href="../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_matrix_combine.html">../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_matrix_combine.html</a>
<div id="iframe">
<iframe src="../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_matrix_combine.html" width="800" height="600"></iframe>
</div>
<div id="result"></div>
</body>
</html>
@@ -0,0 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.

Test: ../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_matrix_to_matrix.html
[ PASS ] All tests passed
@@ -0,0 +1,18 @@
<!-- This file is auto-generated by Tools/Scripts/update-webgl-conformance-tests. DO NOT EDIT -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>WebGL Conformance Test Wrapper for conversions_matrix_to_matrix.html</title>
<script type="text/javascript" src="../../../../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="../../../../../resources/webkit-webgl-test-harness.js"></script>
</head>
<body>
<p>This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.</p>
Test: <a href="../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_matrix_to_matrix.html">../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_matrix_to_matrix.html</a>
<div id="iframe">
<iframe src="../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_matrix_to_matrix.html" width="800" height="600"></iframe>
</div>
<div id="result"></div>
</body>
</html>
@@ -0,0 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.

Test: ../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_matrix.html
[ PASS ] All tests passed
@@ -0,0 +1,18 @@
<!-- This file is auto-generated by Tools/Scripts/update-webgl-conformance-tests. DO NOT EDIT -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>WebGL Conformance Test Wrapper for conversions_scalar_to_matrix.html</title>
<script type="text/javascript" src="../../../../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="../../../../../resources/webkit-webgl-test-harness.js"></script>
</head>
<body>
<p>This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.</p>
Test: <a href="../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_matrix.html">../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_matrix.html</a>
<div id="iframe">
<iframe src="../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_matrix.html" width="800" height="600"></iframe>
</div>
<div id="result"></div>
</body>
</html>
@@ -0,0 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.

Test: ../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_scalar.html
[ PASS ] All tests passed
@@ -0,0 +1,18 @@
<!-- This file is auto-generated by Tools/Scripts/update-webgl-conformance-tests. DO NOT EDIT -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>WebGL Conformance Test Wrapper for conversions_scalar_to_scalar.html</title>
<script type="text/javascript" src="../../../../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="../../../../../resources/webkit-webgl-test-harness.js"></script>
</head>
<body>
<p>This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.</p>
Test: <a href="../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_scalar.html">../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_scalar.html</a>
<div id="iframe">
<iframe src="../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_scalar.html" width="800" height="600"></iframe>
</div>
<div id="result"></div>
</body>
</html>
@@ -0,0 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.

Test: ../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_vector.html
[ PASS ] All tests passed
@@ -0,0 +1,18 @@
<!-- This file is auto-generated by Tools/Scripts/update-webgl-conformance-tests. DO NOT EDIT -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>WebGL Conformance Test Wrapper for conversions_scalar_to_vector.html</title>
<script type="text/javascript" src="../../../../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="../../../../../resources/webkit-webgl-test-harness.js"></script>
</head>
<body>
<p>This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.</p>
Test: <a href="../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_vector.html">../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_vector.html</a>
<div id="iframe">
<iframe src="../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_scalar_to_vector.html" width="800" height="600"></iframe>
</div>
<div id="result"></div>
</body>
</html>
@@ -0,0 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.

Test: ../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_vector_combine.html
[ PASS ] All tests passed
@@ -0,0 +1,18 @@
<!-- This file is auto-generated by Tools/Scripts/update-webgl-conformance-tests. DO NOT EDIT -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>WebGL Conformance Test Wrapper for conversions_vector_combine.html</title>
<script type="text/javascript" src="../../../../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="../../../../../resources/webkit-webgl-test-harness.js"></script>
</head>
<body>
<p>This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.</p>
Test: <a href="../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_vector_combine.html">../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_vector_combine.html</a>
<div id="iframe">
<iframe src="../../../../../resources/webgl_test_files/deqp/data/gles2/shaders/conversions_vector_combine.html" width="800" height="600"></iframe>
</div>
<div id="result"></div>
</body>
</html>

0 comments on commit d5ab79c

Please sign in to comment.