wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 8d885b139d7d (bug 912280) for bustage.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2014-02-07 10:38:27 -05:00
parent 9df5038d73
commit 15a84a312d
11 changed files with 2 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -901,7 +901,6 @@ protected:
OES_texture_float,
OES_texture_float_linear,
OES_texture_half_float,
OES_texture_half_float_linear,
OES_vertex_array_object,
WEBGL_compressed_texture_atc,
WEBGL_compressed_texture_pvrtc,

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

@ -24,7 +24,6 @@ static const char *sExtensionNames[] = {
"OES_texture_float",
"OES_texture_float_linear",
"OES_texture_half_float",
"OES_texture_half_float_linear",
"OES_vertex_array_object",
"WEBGL_compressed_texture_atc",
"WEBGL_compressed_texture_pvrtc",
@ -94,8 +93,6 @@ bool WebGLContext::IsExtensionSupported(WebGLExtensionID ext) const
// right before making the relevant calls.
return gl->IsExtensionSupported(GLContext::OES_texture_half_float) ||
gl->IsSupported(GLFeature::texture_half_float);
case OES_texture_half_float_linear:
return gl->IsSupported(GLFeature::texture_half_float_linear);
case OES_vertex_array_object:
return WebGLExtensionVertexArray::IsSupported(this);
case EXT_texture_filter_anisotropic:
@ -266,9 +263,6 @@ WebGLContext::EnableExtension(WebGLExtensionID ext)
case OES_texture_half_float:
obj = new WebGLExtensionTextureHalfFloat(this);
break;
case OES_texture_half_float_linear:
obj = new WebGLExtensionTextureHalfFloatLinear(this);
break;
case WEBGL_draw_buffers:
obj = new WebGLExtensionDrawBuffers(this);
break;

20
content/canvas/src/WebGLExtensionTextureHalfFloatLinear.cpp
View File

@ -1,20 +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 "mozilla/dom/WebGLRenderingContextBinding.h"
using namespace mozilla;
WebGLExtensionTextureHalfFloatLinear::WebGLExtensionTextureHalfFloatLinear(WebGLContext* context)
: WebGLExtensionBase(context)
{
}
WebGLExtensionTextureHalfFloatLinear::~WebGLExtensionTextureHalfFloatLinear()
{
}
IMPL_WEBGL_EXTENSION_GOOP(WebGLExtensionTextureHalfFloatLinear)

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

@ -171,16 +171,6 @@ public:
DECL_WEBGL_EXTENSION_GOOP
};
class WebGLExtensionTextureHalfFloatLinear
: public WebGLExtensionBase
{
public:
WebGLExtensionTextureHalfFloatLinear(WebGLContext*);
virtual ~WebGLExtensionTextureHalfFloatLinear();
DECL_WEBGL_EXTENSION_GOOP
};
class WebGLExtensionDrawBuffers
: public WebGLExtensionBase
{

4
content/canvas/src/WebGLTexture.cpp
View File

@ -350,8 +350,8 @@ WebGLTexture::ResolvedFakeBlackStatus() {
"Try enabling the OES_texture_float_linear extension if supported.", msg_rendering_as_black);
mFakeBlackStatus = WebGLTextureFakeBlackStatus::IncompleteTexture;
}
} else if (ImageInfoBase().mType == LOCAL_GL_HALF_FLOAT_OES &&
!Context()->IsExtensionEnabled(WebGLContext::OES_texture_half_float_linear))
}
else if (ImageInfoBase().mType == LOCAL_GL_HALF_FLOAT_OES)
{
if (mMinFilter == LOCAL_GL_LINEAR ||
mMinFilter == LOCAL_GL_LINEAR_MIPMAP_LINEAR ||

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

@ -59,7 +59,6 @@ if CONFIG['MOZ_WEBGL']:
'WebGLExtensionTextureFloat.cpp',
'WebGLExtensionTextureFloatLinear.cpp',
'WebGLExtensionTextureHalfFloat.cpp',
'WebGLExtensionTextureHalfFloatLinear.cpp',
'WebGLExtensionVertexArray.cpp',
'WebGLFramebuffer.cpp',
'WebGLObjectModel.cpp',

5
dom/bindings/Bindings.conf
View File

@ -1410,11 +1410,6 @@ DOMInterfaces = {
'headerFile': 'WebGLExtensions.h'
},
'WebGLExtensionTextureHalfFloatLinear': {
'nativeType': 'mozilla::WebGLExtensionTextureHalfFloatLinear',
'headerFile': 'WebGLExtensions.h'
},
'WebGLExtensionDrawBuffers': {
'nativeType': 'mozilla::WebGLExtensionDrawBuffers',
'headerFile': 'WebGLExtensions.h'

5
dom/webidl/WebGLRenderingContext.webidl
View File

@ -901,11 +901,6 @@ interface WebGLExtensionTextureHalfFloat
const GLenum HALF_FLOAT_OES = 0x8D61;
};
[NoInterfaceObject]
interface WebGLExtensionTextureHalfFloatLinear
{
};
[NoInterfaceObject]
interface WebGLExtensionVertexArray {
const GLenum VERTEX_ARRAY_BINDING_OES = 0x85B5;

1
gfx/gl/GLContext.cpp
View File

@ -84,7 +84,6 @@ static const char *sExtensionNames[] = {
"GL_OES_texture_float_linear",
"GL_ARB_texture_float",
"GL_OES_texture_half_float",
"GL_OES_texture_half_float_linear",
"GL_NV_half_float",
"GL_EXT_unpack_subimage",
"GL_OES_standard_derivatives",

2
gfx/gl/GLContext.h
View File

@ -107,7 +107,6 @@ MOZ_BEGIN_ENUM_CLASS(GLFeature)
texture_float,
texture_float_linear,
texture_half_float,
texture_half_float_linear,
texture_non_power_of_two,
transform_feedback,
vertex_array_object,
@ -361,7 +360,6 @@ public:
OES_texture_float_linear,
ARB_texture_float,
OES_texture_half_float,
OES_texture_half_float_linear,
NV_half_float,
EXT_unpack_subimage,
OES_standard_derivatives,

12
gfx/gl/GLContextFeatures.cpp
View File

@ -309,18 +309,6 @@ static const FeatureInfo sFeatureInfoArr[] = {
* WebGL handles this specifically with an OES_texture_half_float check.
*/
},
{
"texture_half_float_linear",
310, // OpenGL version
300, // OpenGL ES version
{
GLContext::ARB_half_float_pixel,
GLContext::ARB_texture_float,
GLContext::NV_half_float,
GLContext::OES_texture_half_float_linear,
GLContext::Extensions_End
}
},
{
"texture_non_power_of_two",
200, // OpenGL version