Merge pull request #1003 from Mobica/fbo3

Added files missing from the previous commit.

sdk/tests/deqp/00_test_list.txt

@@ -0,0 +1,7 @@
+// files that end in .txt list other tests
+// other lines are assumed to be .html files
+
+--min-version 1.0.4 data/gles2/shaders/00_test_list.txt
+--min-version 2.0.0 data/gles3/shaders/00_test_list.txt
+--min-version 2.0.0 framework/opengl/simplereference/00_test_list.txt
+--min-version 2.0.0 functional/gles3/00_test_list.txt

sdk/tests/deqp/framework/opengl/gluObjectWrapper.js

@@ -0,0 +1,122 @@
+/*-------------------------------------------------------------------------
+ * drawElements Quality Program OpenGL ES Utilities
+ * ------------------------------------------------
+ *
+ * Copyright 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+'use strict';
+
+goog.provide('framework.opengl.gluObjectWrapper');
+
+goog.scope(function() {
+    var gluObjectWrapper = framework.opengl.gluObjectWrapper;
+
+    /**
+    * @typedef {function(this:WebGLRenderingContextBase): WebGLObject}
+    */
+    gluObjectWrapper.funcGenT;
+
+    /**
+    * @typedef {function(this:WebGLRenderingContextBase, WebGLObject)}
+    */
+    gluObjectWrapper.funcDelT;
+
+    /**
+    * @typedef {{name: string, funcGen: !gluObjectWrapper.funcGenT, funcDel: !gluObjectWrapper.funcDelT}}
+    */
+    gluObjectWrapper.traitsT;
+
+
+    /**
+    * Returns an object containing a configuration for an ObjectWrapper
+    * @param {string} name
+    * @param {gluObjectWrapper.funcGenT} funcGen
+    * @param {gluObjectWrapper.funcDelT} funcDel
+    * @return {gluObjectWrapper.traitsT} 
+    */
+    gluObjectWrapper.traits = function(name, funcGen, funcDel) {
+        return {
+            name: name,
+            funcGen: funcGen,
+            funcDel: funcDel
+        };
+    };
+
+
+    /**
+    * @constructor
+    * @param {WebGLRenderingContextBase} gl
+    * @param {gluObjectWrapper.traitsT} traits
+    */
+    gluObjectWrapper.ObjectWrapper = function(gl, traits) {
+        /**
+        * @protected
+        * @type {WebGLRenderingContextBase}
+        */
+        this.m_gl = gl;
+
+        /**
+        * @protected
+        * @type {gluObjectWrapper.traitsT}
+        */
+        this.m_traits = traits;
+
+        /**
+        * @protected
+        * @type {WebGLObject}
+        */
+        this.m_object = this.m_traits.funcGen.call(gl);;
+
+    };
+
+
+    /**
+    * Destorys the WebGLObject associated with this object.
+    */
+    gluObjectWrapper.ObjectWrapper.prototype.clear = function() {
+        this.m_traits.funcDel.call(this.m_gl, this.m_object);
+    };
+
+
+    /**
+    * Returns the WebGLObject associated with this object.
+    * @return {WebGLObject} 
+    */
+    gluObjectWrapper.ObjectWrapper.prototype.get = function() {
+        return this.m_object;
+    };
+
+
+    /**
+    * @constructor
+    * @extends {gluObjectWrapper.ObjectWrapper}
+    * @param {WebGLRenderingContextBase} gl
+    */
+    gluObjectWrapper.Framebuffer = function(gl) {
+        gluObjectWrapper.ObjectWrapper.call(this, gl, gluObjectWrapper.traits(
+            'framebuffer',
+            /** @type {gluObjectWrapper.funcGenT} */(gl.createFramebuffer),
+            /** @type {gluObjectWrapper.funcDelT} */(gl.deleteFramebuffer)
+        ));
+    };
+    gluObjectWrapper.Framebuffer.prototype = Object.create(gluObjectWrapper.ObjectWrapper.prototype);
+    gluObjectWrapper.Framebuffer.prototype.constructor = gluObjectWrapper.Framebuffer;
+
+    /**
+    * @return {WebGLFramebuffer} 
+    */
+    gluObjectWrapper.Framebuffer.prototype.get;
+});

sdk/tests/deqp/framework/opengl/simplereference/00_test_list.txt

@@ -0,0 +1 @@
+referencecontext.html

sdk/tests/deqp/framework/opengl/simplereference/referencecontext.html

@@ -0,0 +1,34 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Reference context test</title>
+<link rel="stylesheet" href="../../../../resources/js-test-style.css"/>
+<script src="../../../../resources/js-test-pre.js"></script>
+<script src="../../../../conformance/resources/webgl-test-utils.js"></script>
+
+<script src="../../../../closure-library/closure/goog/base.js"></script>
+<script src="../../../deqp-deps.js"></script>
+<script>goog.require('framework.opengl.simplereference.sglrReferenceContextTest');</script>
+</head>
+<body>
+<div id="description"></div>
+<div id="console"></div>
+<canvas id="canvas" width="200" height="100"> </canvas>
+<script>
+var wtu = WebGLTestUtils;
+var gl = wtu.create3DContext('canvas', {preserveDrawingBuffer: true}, 2);
+
+    try {
+      framework.opengl.simplereference.sglrReferenceContextTest.run(gl);
+    }
+    catch(err)
+    {
+        bufferedLogToConsole(err);
+    }
+
+</script>
+</body>
+</html>