Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-03 07:01:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset ca5b7ed0dd5a (bug 973815) because of build bustage

Browse Source
This commit is contained in:
Ehsan Akhgari 2014-06-13 21:09:10 -04:00
parent d4f67e83f9
commit 0f2c9e9356
9 changed files with 6 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/canvas/src/WebGL2Context.cpp
View File

@ -64,7 +64,6 @@ WebGLContext::InitWebGL2()
const WebGLExtensionID sExtensionNativelySupportedArr[] = {
WebGLExtensionID::ANGLE_instanced_arrays,
WebGLExtensionID::EXT_blend_minmax,
WebGLExtensionID::OES_element_index_uint,
WebGLExtensionID::OES_standard_derivatives,
WebGLExtensionID::OES_texture_float,
@ -74,6 +73,7 @@ WebGLContext::InitWebGL2()
WebGLExtensionID::WEBGL_draw_buffers
};
const GLFeature sFeatureRequiredArr[] = {
GLFeature::blend_minmax,
GLFeature::instanced_non_arrays,
GLFeature::transform_feedback
};

10
content/canvas/src/WebGLContextExtensions.cpp
View File

@ -31,7 +31,6 @@ WebGLContext::GetExtensionString(WebGLExtensionID ext)
sExtensionNamesEnumeratedArray[WebGLExtensionID::x] = #x;
WEBGL_EXTENSION_IDENTIFIER(ANGLE_instanced_arrays)
WEBGL_EXTENSION_IDENTIFIER(EXT_blend_minmax)
WEBGL_EXTENSION_IDENTIFIER(EXT_color_buffer_half_float)
WEBGL_EXTENSION_IDENTIFIER(EXT_frag_depth)
WEBGL_EXTENSION_IDENTIFIER(EXT_sRGB)
@ -163,16 +162,16 @@ bool WebGLContext::IsExtensionSupported(WebGLExtensionID ext) const
// For warnings-as-errors.
break;
}
// Uncomment this switch for any new extensions
#if 0
if (Preferences::GetBool("webgl.enable-draft-extensions", false) || IsWebGL2()) {
switch (ext) {
case WebGLExtensionID::EXT_blend_minmax:
return WebGLExtensionBlendMinMax::IsSupported(this);
default:
// For warnings-as-errors.
break;
}
}
#endif
return false;
}
@ -331,9 +330,6 @@ WebGLContext::EnableExtension(WebGLExtensionID ext)
case WebGLExtensionID::EXT_frag_depth:
obj = new WebGLExtensionFragDepth(this);
break;
case WebGLExtensionID::EXT_blend_minmax:
obj = new WebGLExtensionBlendMinMax(this);
break;
default:
MOZ_ASSERT(false, "should not get there.");
}

3
content/canvas/src/WebGLContextValidate.cpp
View File

@ -328,7 +328,8 @@ bool WebGLContext::ValidateBlendEquationEnum(GLenum mode, const char *info)
return true;
case LOCAL_GL_MIN:
case LOCAL_GL_MAX:
if (IsExtensionEnabled(WebGLExtensionID::EXT_blend_minmax)) {
if (IsWebGL2()) {
// http://www.opengl.org/registry/specs/EXT/blend_minmax.txt
return true;
}
break;

30
content/canvas/src/WebGLExtensionBlendMinMax.cpp
View File

@ -1,30 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "WebGLContext.h"
#include "WebGLExtensions.h"
#include "GLContext.h"
#include "mozilla/dom/WebGLRenderingContextBinding.h"
using namespace mozilla;
WebGLExtensionBlendMinMax::WebGLExtensionBlendMinMax(WebGLContext* context)
: WebGLExtensionBase(context)
{
}
WebGLExtensionBlendMinMax::~WebGLExtensionBlendMinMax()
{
}
bool WebGLExtensionBlendMinMax::IsSupported(const WebGLContext* context)
{
gl::GLContext * gl = context->GL();
return gl->IsSupported(GLFeature::blend_minmax);
}
IMPL_WEBGL_EXTENSION_GOOP(WebGLExtensionBlendMinMax)

12
content/canvas/src/WebGLExtensions.h
View File

@ -309,18 +309,6 @@ public:
DECL_WEBGL_EXTENSION_GOOP
};
class WebGLExtensionBlendMinMax
: public WebGLExtensionBase
{
public:
WebGLExtensionBlendMinMax(WebGLContext*);
virtual ~WebGLExtensionBlendMinMax();
static bool IsSupported(const WebGLContext*);
DECL_WEBGL_EXTENSION_GOOP
};
} // namespace mozilla
#endif // WEBGLEXTENSIONS_H_

1
content/canvas/src/WebGLTypes.h
View File

@ -146,7 +146,6 @@ MOZ_END_ENUM_CLASS(WebGLTexImageFunc)
// Please keep extensions in alphabetic order.
MOZ_BEGIN_ENUM_CLASS(WebGLExtensionID, uint8_t)
ANGLE_instanced_arrays,
EXT_blend_minmax,
EXT_color_buffer_half_float,
EXT_frag_depth,
EXT_sRGB,

1
content/canvas/src/moz.build
View File

@ -45,7 +45,6 @@ if CONFIG['MOZ_WEBGL']:
'WebGLContextVertices.cpp',
'WebGLElementArrayCache.cpp',
'WebGLExtensionBase.cpp',
'WebGLExtensionBlendMinMax.cpp',
'WebGLExtensionColorBufferFloat.cpp',
'WebGLExtensionColorBufferHalfFloat.cpp',
'WebGLExtensionCompressedTextureATC.cpp',

5
dom/bindings/Bindings.conf
View File

@ -1489,11 +1489,6 @@ DOMInterfaces = {
'headerFile': 'WebGLExtensions.h'
},
'WebGLExtensionBlendMinMax': {
'nativeType': 'mozilla::WebGLExtensionBlendMinMax',
'headerFile': 'WebGLExtensions.h'
},
'WebGLFramebuffer': {
'nativeType': 'mozilla::WebGLFramebuffer',
'headerFile': 'WebGLFramebuffer.h'

6
dom/webidl/WebGLRenderingContext.webidl
View File

@ -959,9 +959,3 @@ interface WebGLExtensionInstancedArrays {
void drawElementsInstancedANGLE(GLenum mode, GLsizei count, GLenum type, GLintptr offset, GLsizei primcount);
void vertexAttribDivisorANGLE(GLuint index, GLuint divisor);
};
[NoInterfaceObject]
interface WebGLExtensionBlendMinMax {
const GLenum MIN_EXT = 0x8007;
const GLenum MAX_EXT = 0x8008;
};