diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-03-10 22:33:51 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-03-11 06:41:21 +0000 |
| commit | dce8a3300b191eeebee6f15f3f6e0f5a12a177b1 (patch) | |
| tree | a38500afc01411508ba2cb986f490ca4c8fa9ca1 /dom/canvas | |
| parent | 515c1193c5663e46a313acb7a39ed2f3d209f69e (diff) | |
| download | uxp-dce8a3300b191eeebee6f15f3f6e0f5a12a177b1.tar.gz | |
Issue #1053 - Remove Android-specific blocks from system headers and /dom
Diffstat (limited to 'dom/canvas')
| -rw-r--r-- | dom/canvas/WebGLContextGL.cpp | 11 | ||||
| -rw-r--r-- | dom/canvas/WebGLFramebuffer.cpp | 7 | ||||
| -rw-r--r-- | dom/canvas/WebGLFramebuffer.h | 11 |
3 files changed, 0 insertions, 29 deletions
diff --git a/dom/canvas/WebGLContextGL.cpp b/dom/canvas/WebGLContextGL.cpp index e58fcd0d8f..d01a0d44e3 100644 --- a/dom/canvas/WebGLContextGL.cpp +++ b/dom/canvas/WebGLContextGL.cpp @@ -145,9 +145,6 @@ WebGLContext::BindFramebuffer(GLenum target, WebGLFramebuffer* wfb) } else { GLuint framebuffername = wfb->mGLName; gl->fBindFramebuffer(target, framebuffername); -#ifdef ANDROID - wfb->mIsFB = true; -#endif } switch (target) { @@ -982,14 +979,6 @@ WebGLContext::IsFramebuffer(const WebGLFramebuffer* fb) if (!ValidateIsObject("isFramebuffer", fb)) return false; -#ifdef ANDROID - if (gl->WorkAroundDriverBugs() && - gl->Renderer() == GLRenderer::AndroidEmulator) - { - return fb->mIsFB; - } -#endif - MakeContextCurrent(); return gl->fIsFramebuffer(fb->mGLName); } diff --git a/dom/canvas/WebGLFramebuffer.cpp b/dom/canvas/WebGLFramebuffer.cpp index 0abaf3dd79..7a1d4dbd9e 100644 --- a/dom/canvas/WebGLFramebuffer.cpp +++ b/dom/canvas/WebGLFramebuffer.cpp @@ -621,9 +621,6 @@ WebGLFBAttachPoint::GetParameter(const char* funcName, WebGLContext* webgl, JSCo WebGLFramebuffer::WebGLFramebuffer(WebGLContext* webgl, GLuint fbo) : WebGLRefCountedObject(webgl) , mGLName(fbo) -#ifdef ANDROID - , mIsFB(false) -#endif , mDepthAttachment(this, LOCAL_GL_DEPTH_ATTACHMENT) , mStencilAttachment(this, LOCAL_GL_STENCIL_ATTACHMENT) , mDepthStencilAttachment(this, LOCAL_GL_DEPTH_STENCIL_ATTACHMENT) @@ -657,10 +654,6 @@ WebGLFramebuffer::Delete() mContext->gl->fDeleteFramebuffers(1, &mGLName); LinkedListElement<WebGLFramebuffer>::removeFrom(mContext->mFramebuffers); - -#ifdef ANDROID - mIsFB = false; -#endif } //// diff --git a/dom/canvas/WebGLFramebuffer.h b/dom/canvas/WebGLFramebuffer.h index 53e01dfe76..133bf3d090 100644 --- a/dom/canvas/WebGLFramebuffer.h +++ b/dom/canvas/WebGLFramebuffer.h @@ -155,17 +155,6 @@ public: const GLuint mGLName; protected: -#ifdef ANDROID - // Bug 1140459: Some drivers (including our test slaves!) don't - // give reasonable answers for IsRenderbuffer, maybe others. - // This shows up on Android 2.3 emulator. - // - // So we track the `is a Framebuffer` state ourselves. - bool mIsFB; -#endif - - //// - WebGLFBAttachPoint mDepthAttachment; WebGLFBAttachPoint mStencilAttachment; WebGLFBAttachPoint mDepthStencilAttachment; |