Bug 1178893 - Made state/gl-enum-tests Conformant. r=kamidphish
authorLiam Middlebrook <liammiddlebrook@gmail.com>
Wed, 26 Aug 2015 15:35:43 -0400
changeset 260007 143e3838bd2c3915840681adf564e36869a0a849
parent 260006 d890a8243f93d043c6d9bb9b9fdae165ee05d2a2
child 260008 2d74734792df6d3f68c7a5fe3139c8cab3e3d790
push id29297
push userryanvm@gmail.com
push dateMon, 31 Aug 2015 02:08:25 +0000
treeherdermozilla-central@975b92a32949 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskamidphish
bugs1178893
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1178893 - Made state/gl-enum-tests Conformant. r=kamidphish GL_NUM_COMPRESSED_TEXTURE_FORMATS isn't a valid enum for gl.getParameter so instead of setting a GL_NO_ERROR it should set a GL_INVALID_ENUM.
dom/canvas/WebGLContextState.cpp
--- a/dom/canvas/WebGLContextState.cpp
+++ b/dom/canvas/WebGLContextState.cpp
@@ -386,18 +386,16 @@ WebGLContext::GetParameter(JSContext* cx
             return JS::Int32Value(mGLMaxVertexUniformVectors);
 
         case LOCAL_GL_MAX_FRAGMENT_UNIFORM_VECTORS:
             return JS::Int32Value(mGLMaxFragmentUniformVectors);
 
         case LOCAL_GL_MAX_VARYING_VECTORS:
             return JS::Int32Value(mGLMaxVaryingVectors);
 
-        case LOCAL_GL_NUM_COMPRESSED_TEXTURE_FORMATS:
-            return JS::Int32Value(0);
         case LOCAL_GL_COMPRESSED_TEXTURE_FORMATS: {
             uint32_t length = mCompressedTextureFormats.Length();
             JSObject* obj = dom::Uint32Array::Create(cx, this, length,
                                                      mCompressedTextureFormats.Elements());
             if (!obj) {
                 rv = NS_ERROR_OUT_OF_MEMORY;
             }
             return JS::ObjectOrNullValue(obj);