Minor fixups before merging

KhronosGroup · Sep 22, 2023 · 586a806 · 586a806
1 parent b7dbbb0
commit 586a806
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 32 deletions.
diff --git a/conformance-suites/2.0.0/conformance/canvas/00_test_list.txt b/conformance-suites/2.0.0/conformance/canvas/00_test_list.txt
@@ -2,7 +2,6 @@ buffer-offscreen-test.html
 buffer-preserve-test.html
 canvas-test.html
 canvas-zero-size.html
-drawingbuffer-storage-test.html
 drawingbuffer-static-canvas-test.html
 --min-version 1.0.2 drawingbuffer-hd-dpi-test.html
 drawingbuffer-test.html

diff --git a/sdk/tests/conformance2/canvas/00_test_list.txt b/sdk/tests/conformance2/canvas/00_test_list.txt
@@ -1 +1,2 @@
+--min-version 2.0.1 drawingbuffer-storage-test.html
 --min-version 2.0.1 to-data-url-with-pack-params.html
diff --git a/...ce/canvas/drawingbuffer-storage-test.html → ...e2/canvas/drawingbuffer-storage-test.html b/...ce/canvas/drawingbuffer-storage-test.html → ...e2/canvas/drawingbuffer-storage-test.html
@@ -1,30 +1,8 @@
 <!--
-
-/*
-** Copyright (c) 2012 The Khronos Group Inc.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
+Copyright (c) 2023 The Khronos Group Inc.
+Use of this source code is governed by an MIT-style license that can be
+found in the LICENSE.txt file.
 -->
-
 <!DOCTYPE html>
 <html>
 <head>
@@ -52,7 +30,7 @@
 
 function initialize() {
   var canvas = document.createElement("canvas");
-  gl = wtu.create3DContext(canvas, {antialias: false});
+  gl = wtu.create3DContext(canvas, {antialias: false}, 2);
   if (!gl) {
     testFailed("context does not exist");
     return [0, 0];
@@ -95,7 +73,7 @@
   canvas.width = 16;
   canvas.height = 16;
 
-  gl = wtu.create3DContext(canvas, {antialias: false});
+  gl = wtu.create3DContext(canvas, {antialias: false}, 2);
   if (!gl) {
     testFailed("context does not exist");
     return;
@@ -159,7 +137,7 @@
   var canvas = document.createElement("canvas");
   canvas.width = 16;
   canvas.height = 16;
-  gl = wtu.create3DContext(canvas, {alpha:false});
+  gl = wtu.create3DContext(canvas, {alpha:false}, 2);
   if (!gl) {
     testFailed("context does not exist");
     return;
@@ -178,7 +156,7 @@
   var canvas = document.createElement("canvas");
   canvas.width = 16;
   canvas.height = 16;
-  gl = wtu.create3DContext(canvas);
+  gl = wtu.create3DContext(canvas, undefined, 2);
   if (!gl) {
     testFailed("context does not exist");
     return;
@@ -193,7 +171,7 @@
   var canvas = document.createElement("canvas");
   canvas.width = 16;
   canvas.height = 16;
-  gl = wtu.create3DContext(canvas);
+  gl = wtu.create3DContext(canvas, undefined, 2);
   if (!gl) {
     testFailed("context does not exist");
     return;
@@ -218,7 +196,7 @@
   let canvasGL = document.createElement("canvas");
   canvasGL.width = 16;
   canvasGL.height = 16;
-  gl = wtu.create3DContext(canvasGL);
+  gl = wtu.create3DContext(canvasGL, undefined, 2);
   if (!gl) {
     testFailed("context does not exist");
     return;
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		--min-version 2.0.1 drawingbuffer-storage-test.html
		--min-version 2.0.1 to-data-url-with-pack-params.html