зеркало из https://github.com/mozilla/pjs.git
b=593850; [webgl] remove bogus webgl debug utils from tests; r=bjacob
This commit is contained in:
Родитель
e76bb05f4e
Коммит
6f7f10b1ae
|
@ -11,7 +11,6 @@ found in the LICENSE file.
|
|||
<link rel="stylesheet" href="../resources/js-test-style.css"/>
|
||||
<script src="../resources/js-test-pre.js"></script>
|
||||
<script src="resources/webgl-test.js"> </script>
|
||||
<script src="../../debug/webgl-debug.js"> </script>
|
||||
</head>
|
||||
<body>
|
||||
<canvas id="example" width="24" height="24"></canvas>
|
||||
|
@ -57,7 +56,6 @@ function init()
|
|||
|
||||
gl = initWebGL("example", "vshader", "fshader", [ "vPosition", "texCoord0"],
|
||||
[ 0, 0, 0, 1 ], 1);
|
||||
gl = WebGLDebugUtils.makeDebugContext(gl);
|
||||
|
||||
gl.disable(gl.DEPTH_TEST);
|
||||
gl.disable(gl.BLEND);
|
||||
|
|
|
@ -11,7 +11,6 @@ found in the LICENSE file.
|
|||
<link rel="stylesheet" href="../resources/js-test-style.css"/>
|
||||
<script src="../resources/js-test-pre.js"></script>
|
||||
<script src="resources/webgl-test.js"> </script>
|
||||
<script src="../../debug/webgl-debug.js"> </script>
|
||||
</head>
|
||||
<body>
|
||||
<canvas id="example" width="2" height="2" style="width: 40px; height: 40px;"></canvas>
|
||||
|
@ -69,7 +68,6 @@ function init()
|
|||
|
||||
gl = initWebGL("example", "vshader", "fshader2d", [ "vPosition", "texCoord0"],
|
||||
[ 0, 0, 0, 1 ], 1);
|
||||
gl = WebGLDebugUtils.makeDebugContext(gl);
|
||||
|
||||
var program2d = gl.program;
|
||||
var programCube = loadProgram(gl, "vshader", "fshaderCube", false);
|
||||
|
|
|
@ -33,7 +33,10 @@ if (!gl) {
|
|||
testFailed("context does not exist");
|
||||
} else {
|
||||
testPassed("context exists");
|
||||
WebGLDebugUtils.init(gl);
|
||||
if ("WebGLDebugUtils" in window)
|
||||
WebGLDebugUtils.init(gl);
|
||||
else
|
||||
WebGLDebugUtils = false;
|
||||
|
||||
debug("");
|
||||
debug("Checking texture formats.");
|
||||
|
@ -189,7 +192,7 @@ if (!gl) {
|
|||
gl.uniform1i(loc, 0);
|
||||
|
||||
function checkType(r, g, b, a, type, format, buf) {
|
||||
var typeName = WebGLDebugUtils.glEnumToString(type);
|
||||
var typeName = WebGLDebugUtils ? WebGLDebugUtils.glEnumToString(type) : type;
|
||||
debug("");
|
||||
debug("checking gl.texImage2D with type: " + typeName);
|
||||
gl.texImage2D(gl.TEXTURE_2D,
|
||||
|
|
|
@ -11,7 +11,6 @@ found in the LICENSE file.
|
|||
<link rel="stylesheet" href="../resources/js-test-style.css"/>
|
||||
<script src="../resources/js-test-pre.js"></script>
|
||||
<script src="resources/webgl-test.js"> </script>
|
||||
<script src="../../debug/webgl-debug.js"> </script>
|
||||
<script src="resources/webgl-test-utils.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
|
@ -36,7 +35,6 @@ function init()
|
|||
var canvas = document.getElementById("example");
|
||||
gl = wtu.create3DContext(canvas);
|
||||
var program = wtu.setupTexturedQuad(gl);
|
||||
gl = WebGLDebugUtils.makeDebugContext(gl);
|
||||
|
||||
var textureLoc = gl.getUniformLocation(program, "tex");
|
||||
|
||||
|
|
|
@ -30,10 +30,6 @@ conformance/tex-image-and-sub-image-2d-with-video.html
|
|||
conformance/tex-image-with-format-and-type.html
|
||||
conformance/tex-image-with-invalid-data.html
|
||||
conformance/tex-input-validation.html
|
||||
conformance/texparameter-test.html
|
||||
conformance/texture-active-bind-2.html
|
||||
conformance/texture-formats-test.html
|
||||
conformance/uniform-samplers-test.html
|
||||
conformance/viewport-unchanged-upon-resize.html
|
||||
more/conformance/constants.html
|
||||
more/conformance/getContext.html
|
||||
|
|
Загрузка…
Ссылка в новой задаче