mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
5a3b3d60eb
- Bug 1173260 - stub out tests that fail when 'cursive' is looked up via fontconfig. r=m_kato (0bb3f03cb8)
- bug 1215657 - make AccessibleWrap::get_accDefaultAction work with proxied accessibles r=davidb (5732eb38eb)
- Bug 1210549 - Allow IServiceProvider::QueryService to work for proxied accessibles r=tbsaunde (7dcd9c2271)
- bug 1215657 - make AccessibleWrap::accSelect work with proxies r=davidb (d52e3d4873)
- Bug 1225682 - Don't use nsAuto{,C}String as class member variables in rdf/. r=Pike (f681938445)
- Bug 1232454 - use UniquePtr<T[]> instead of nsAutoArrayPtr<T> in security/apps/; r=keeler (e416936ed6)
- Bug 1235796 - Allow allocating YCbCr textures with Cb/Cr planes bigger than the Y plane. r=jrmuizel (8f1dbe137c)
- Bug 1241816 - In CreateSourceSurfaceFromMacIOSurface, unlock the IOSurface even in failure cases. r=mattwoodrow (218e6da6c1)
- Bug 1240190 - Add D3D9 texture upload profiler labels. r=jrmuizel (1e55b77bdf)
- Bug 1213429 - Recycle e10s D3D9 textures and add partial upload support. r=Bas (97aeeefdd2)
- Bug 1213429 - Check the result of LockRect. r=Bas (1c3c981d80)
- Bug 1213429 - GCC compilation fixup. (5449005c99)
- Lazily initialize D3D11 mix-blend shaders. (bug 1246388, r=mattwoodrow) (6fd3226030)
- Bug 1237375: Add some more extensive debugging information. r=milan (aed95e4774)
- Bug 1239861. Part 2 Properly resize DXGI swap chain buffer size. r=bas (e9bf410de4)
- Bug 1247775 - Part 1: Remove D3D10/D2D 1.0 texture integration from layers. r=dvander (74d7e93792)
- Bug 1247775 - Part 2: Remove Direct2D 1.0 code from Thebes. r=dvander (f0a1f53917)
- Bug 1247775 - Part 3: Remove Moz2D code to support Direct2D 1.0. r=dvander (10d27128eb)
- Bug 1221656 - Copy mp4parse.h in update-rust.sh. r=kinetik (96ebce3eb8)
- Bug 868333 - Match more MP4 family file types in media sniffer. r=rillian (cd29bd2a74)
- Bug 1211802 - Recognize 'avc?' as mp4 video. r=jya (b68726705b)
- Bug 1244523: [mp4] P2. Have sniffer recognise ftyp qt subtype. r=cpearce (1770f0862b)
- Bug 1087488: Remove some SPROP macro usages in Omnijar.cpp, to avoid triggering -Wtautological-compare clang warning. r=glandium (697dfa9895)
- Bug 1228437 - Add BHR stats from e10s child process. B2G fix by Ting-Yu Chou. r=nchen (213fbb9f37)
- Bug 1198196 - rework EVENTLOOP_UI_LAG_EXP_MS to record all lag. r=vladan (2807460ce0)
- Bug 1240484 - fixed control flow patch issue by adding brackets. r=mccr8 (d2aac14ee1)
- Bug 1242119 - Remove early exit in WinXP debug content processes. r=froydnj (2c2626a1ea)
- Bug 1245513 - Use _exit(0) to exit in B2G debug content processes. r=froydnj (c37efd34d9)
- some crash and profiler stuff (87547f6d8f)
- bug 1234417 - fix a leak in CreateECPublicKey r=rbarnes (99848f0fae)
- Bug 1204784: Handle cases in nsThreadPool where Gecko doesn't own the thread that we're running on. r=froydnj (3f523fc544)
- Bug 1204784: Do not shut the main thread down before all outstanding asynchronous thread shutdowns complete. r=froydnj (6abfb2562f)
- Bug 1234126 - Add Chaos Mode support for setting thread affinity on OS X and Windows. r=froydnj (8811430596)
- Bug 1245586 - add debugging aids for thread shutdown; r=khuey (28b7ae88c3)
- Bug 1191936 - Implement SPKI/PKCS#8/JWK import/export for RSA-PSS r=rbarnes (212ab7fec5)
- Bug 1241757 - Permit export of JWK with empty key_ops field, r=rbarnes (b19f177a13)
- Bug 1205168 - Part 0: Remove copy-ctor from strong type. r=jgilbert (a6070322a1)
- Bug 1205168 - Part 1 - Sort all the WebGLTexelFormats. r=jgilbert (857cd58641)
- Bug 1205168 - Part 2: Texel Conversion - RG8 format. r=jgilbert (6c241194ed)
- Bug 1205168 - Part 3: Texel Conversion - RG16F format. r=jgilbert (7573635218)
- Bug 1205168 - Part 4: Texel Conversion - RG32F format. r=jgilbert (f54343317e)
- Bug 1205168 - Part 5: Texel Conversion - RGB11F11F10F format. r=jgilbert (500514e025)
- Bug 1205168 - Part 6: Fix TexImage2D and TexSubImage2D with texture conversion. r=jgilbert (b5e2e75276)
- Bug 1205168 - Part 7: Remove unneeded functions. r=jgilbert (9bd24cd813)
- Bug 1234744 - Fix build errors in ImageBitmap.h. r=roc (b4b67e5905)
- missing telemetry bits (28161fd3f9)
- Bug 1237193 - Fix WebGL getActiveUniforms return type. r=jgilbert, r=smaug (f9a37a360e)
- Bug 1233353 - Initialize rb correctly if rb bind to READ_FRAMEBUFFER. r=jgilbert (bbc77437a4)
- Bug 1237637 - Disallow negative levels for framebuffer attachments. -r=jrmuizel (fa65b6ad24)
- Bug 1236395 - [WebGL2] pass getFramebufferAttachmentParameter in gl-object-get-calls.html, r=jgilbert (6f9fde1cd2)
- Bug 1236784 - [WebGL2] pass getRenderbufferParameter in gl-object-get-calls.html, r=jgilbert (e4f20f54ad)
- Bug 1238865 - Part 1: Validate attachments before clearBuffer. r=jgilbert (a6e6e05a0c)
- Bug 1229210. Handle the new formats required by WebGL2 in ReadPixels. r=jgilbert (66e305f97d)
- Bug 1238865 - Part 2: Add more format/type checks for WebGL2. r=jgilbert (af629782b3)
- Bug 1238865 - Part 3: Prevent IMPLEMENTATION_COLOR_READ_FORMAT return SRGB_ALPHA. r=jgilbert (81da93d791)
- Bug 1240673 - Fix WebGL2 framebuffer parameter problem. r=jgilbert (2c957a8294)
- Bug 1240438 - Fix WebGL2 framebuffer attachment related implementation. r=jgilbert (b4339241c8)
- Bug 1239187 - Use the GLFeature instead. - r=jrmuizel (c5f2c57646)
- Bug 1094458 - Implement RenderbufferStorageMultisample. - r=jrmuizel (f20f776597)
- Bug 1246007 - Ignore RENDERBUFFER_SAMPLES outside of webgl2. - r=jrmuizel (6b8f59ae49)
- Bug 1243907 - Don't query _BITS enums on Core profiles. - r=jrmuizel (e722abe45b)
- partial Bug 1242120 - Remove switch fallthrough (0f47fb7a71)
- Bug 1236080. Null check format in GetParameter. r=jgilbert (09fedc2ea8)
- Bug 1240662 - Add max level check for framebufferTextureLayer. r=jgilbert (f6d5eda15c)
- Bug 1236091. Move validate checks inside of null checks. r=jgilbert (4c67e04e87)
- Bug 1237191 - Add check for getQueryParameter to return correct error. r=jgilbert (93345aab7e)
- Bug 1230089 - If sampler is bound, use parameter of sampler. r=jgilbert (e4139a5174)
- Bug 1242336 - Fix WebGL2 return type of GL_UNPACK_SKIP. r=jgilbert (4a2ef1956e)
- Bug 1240262 - Annotate intentional switch fallthrough and suppress -Wimplicit-fallthrough warnings in dom/canvas/. r=jgilbert (eaee57ba8f)
- Bug 1237194 - Fix getSyncParameter return error. r=jgilbert (13119be06e)
- Bug 1239541 - Fix WebGL2 texImage related checking. r=jgilbert (6777244db0)
- Bug 1225291 - IsTransformFeedback doesn't report error when input is null. r=jgilbert (8c67d072b5)
- Bug 1233094. Handle null buffers in GetIndexedParameter. r=jgilbert (ae5d75bd47)
- Bug 1228676 - WebGL2 VertexAttrib funcs should match WebGL 1 patterns. - r=jgilbert (bf96c0e17b)
- Bug 1237420 - "Fix length-checking when setting WebGL 2 vertex attributes with an array". r=jgilbert (d8e9ca7111)
- Bug 1233819 - Fix WebGL on WinXP. - r=jrmuizel (39b15ba9ee)
- Bug 1233046 - Mark non-try platforms. Align some tests. (9d16ce70a4)
- Bug 1201885,1247752,1247753 - Re-mark passing/failing tests. (381c71c0f8)
- Bug 1247764 - Disable STENCIL_TEST on mac+intel when not needed. - r=jrmuizel (0b544d0c36)
- Bug 1243908 - Use DrawBuffers through GLScreenBuffer when operating on fb0. - r=jrmuizel (0ac0fc6047)
- Bug 1229944 - Add glClear for zeroing texture data. - r=kamidphish (51df8cbb50)
- Bug 1220450 - Clear length on cache OOM. r=kamidphish (44431a0d3e)
- Bug 1232346 - Clarify ResolveForDraw's failure checking. - r=kamidphish (542917bb85)
305 lines
9.2 KiB
C++
305 lines
9.2 KiB
C++
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/* 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 "WebGLRenderbuffer.h"
|
|
|
|
#include "GLContext.h"
|
|
#include "mozilla/dom/WebGLRenderingContextBinding.h"
|
|
#include "ScopedGLHelpers.h"
|
|
#include "WebGLContext.h"
|
|
#include "WebGLStrongTypes.h"
|
|
#include "WebGLTexture.h"
|
|
|
|
namespace mozilla {
|
|
|
|
static GLenum
|
|
DepthFormatForDepthStencilEmu(gl::GLContext* gl)
|
|
{
|
|
// We might not be able to get 24-bit, so let's pretend!
|
|
if (gl->IsGLES() && !gl->IsExtensionSupported(gl::GLContext::OES_depth24))
|
|
return LOCAL_GL_DEPTH_COMPONENT16;
|
|
|
|
return LOCAL_GL_DEPTH_COMPONENT24;
|
|
}
|
|
|
|
JSObject*
|
|
WebGLRenderbuffer::WrapObject(JSContext* cx, JS::Handle<JSObject*> givenProto)
|
|
{
|
|
return dom::WebGLRenderbufferBinding::Wrap(cx, this, givenProto);
|
|
}
|
|
|
|
static GLuint
|
|
DoCreateRenderbuffer(gl::GLContext* gl)
|
|
{
|
|
MOZ_ASSERT(gl->IsCurrent());
|
|
|
|
GLuint ret = 0;
|
|
gl->fGenRenderbuffers(1, &ret);
|
|
return ret;
|
|
}
|
|
|
|
static bool
|
|
EmulatePackedDepthStencil(gl::GLContext* gl)
|
|
{
|
|
return !gl->IsSupported(gl::GLFeature::packed_depth_stencil);
|
|
}
|
|
|
|
WebGLRenderbuffer::WebGLRenderbuffer(WebGLContext* webgl)
|
|
: WebGLContextBoundObject(webgl)
|
|
, mPrimaryRB( DoCreateRenderbuffer(webgl->gl) )
|
|
, mEmulatePackedDepthStencil( EmulatePackedDepthStencil(webgl->gl) )
|
|
, mSecondaryRB(0)
|
|
, mFormat(nullptr)
|
|
, mSamples(0)
|
|
, mImageDataStatus(WebGLImageDataStatus::NoImageData)
|
|
, mHasBeenBound(false)
|
|
{
|
|
mContext->mRenderbuffers.insertBack(this);
|
|
}
|
|
|
|
void
|
|
WebGLRenderbuffer::Delete()
|
|
{
|
|
mContext->MakeContextCurrent();
|
|
|
|
mContext->gl->fDeleteRenderbuffers(1, &mPrimaryRB);
|
|
if (mSecondaryRB)
|
|
mContext->gl->fDeleteRenderbuffers(1, &mSecondaryRB);
|
|
|
|
LinkedListElement<WebGLRenderbuffer>::removeFrom(mContext->mRenderbuffers);
|
|
}
|
|
|
|
int64_t
|
|
WebGLRenderbuffer::MemoryUsage() const
|
|
{
|
|
// If there is no defined format, we're not taking up any memory
|
|
if (!mFormat)
|
|
return 0;
|
|
|
|
const auto bytesPerPixel = mFormat->format->estimatedBytesPerPixel;
|
|
const int64_t pixels = int64_t(mWidth) * int64_t(mHeight);
|
|
|
|
const int64_t totalSize = pixels * bytesPerPixel;
|
|
return totalSize;
|
|
}
|
|
|
|
static GLenum
|
|
DoRenderbufferStorageMaybeMultisample(gl::GLContext* gl, GLsizei samples,
|
|
GLenum internalFormat, GLsizei width,
|
|
GLsizei height)
|
|
{
|
|
MOZ_ASSERT_IF(samples >= 1, gl->IsSupported(gl::GLFeature::framebuffer_multisample));
|
|
|
|
// Certain OpenGL ES renderbuffer formats may not exist on desktop OpenGL.
|
|
switch (internalFormat) {
|
|
case LOCAL_GL_RGBA4:
|
|
case LOCAL_GL_RGB5_A1:
|
|
// 16-bit RGBA formats are not supported on desktop GL.
|
|
if (!gl->IsGLES())
|
|
internalFormat = LOCAL_GL_RGBA8;
|
|
break;
|
|
|
|
case LOCAL_GL_RGB565:
|
|
// RGB565 is not supported on desktop GL.
|
|
if (!gl->IsGLES())
|
|
internalFormat = LOCAL_GL_RGB8;
|
|
break;
|
|
|
|
case LOCAL_GL_DEPTH_COMPONENT16:
|
|
if (!gl->IsGLES() || gl->IsExtensionSupported(gl::GLContext::OES_depth24))
|
|
internalFormat = LOCAL_GL_DEPTH_COMPONENT24;
|
|
else if (gl->IsSupported(gl::GLFeature::packed_depth_stencil))
|
|
internalFormat = LOCAL_GL_DEPTH24_STENCIL8;
|
|
break;
|
|
|
|
case LOCAL_GL_DEPTH_STENCIL:
|
|
MOZ_CRASH("GL_DEPTH_STENCIL is not valid here.");
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
gl::GLContext::LocalErrorScope errorScope(*gl);
|
|
|
|
if (samples > 0) {
|
|
gl->fRenderbufferStorageMultisample(LOCAL_GL_RENDERBUFFER, samples,
|
|
internalFormat, width, height);
|
|
} else {
|
|
gl->fRenderbufferStorage(LOCAL_GL_RENDERBUFFER, internalFormat, width, height);
|
|
}
|
|
|
|
return errorScope.GetError();
|
|
}
|
|
|
|
GLenum
|
|
WebGLRenderbuffer::DoRenderbufferStorage(uint32_t samples,
|
|
const webgl::FormatUsageInfo* format,
|
|
uint32_t width, uint32_t height)
|
|
{
|
|
MOZ_ASSERT(mContext->mBoundRenderbuffer == this);
|
|
|
|
gl::GLContext* gl = mContext->gl;
|
|
MOZ_ASSERT(samples <= 256); // Sanity check.
|
|
|
|
GLenum primaryFormat = format->format->sizedFormat;
|
|
GLenum secondaryFormat = 0;
|
|
|
|
if (mEmulatePackedDepthStencil && primaryFormat == LOCAL_GL_DEPTH24_STENCIL8) {
|
|
primaryFormat = DepthFormatForDepthStencilEmu(gl);
|
|
secondaryFormat = LOCAL_GL_STENCIL_INDEX8;
|
|
}
|
|
|
|
gl->fBindRenderbuffer(LOCAL_GL_RENDERBUFFER, mPrimaryRB);
|
|
GLenum error = DoRenderbufferStorageMaybeMultisample(gl, samples, primaryFormat,
|
|
width, height);
|
|
if (error)
|
|
return error;
|
|
|
|
if (secondaryFormat) {
|
|
if (!mSecondaryRB) {
|
|
gl->fGenRenderbuffers(1, &mSecondaryRB);
|
|
}
|
|
|
|
gl->fBindRenderbuffer(LOCAL_GL_RENDERBUFFER, mSecondaryRB);
|
|
error = DoRenderbufferStorageMaybeMultisample(gl, samples, secondaryFormat,
|
|
width, height);
|
|
if (error)
|
|
return error;
|
|
} else if (mSecondaryRB) {
|
|
gl->fDeleteRenderbuffers(1, &mSecondaryRB);
|
|
mSecondaryRB = 0;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
WebGLRenderbuffer::RenderbufferStorage(const char* funcName, uint32_t samples,
|
|
GLenum internalFormat, uint32_t width,
|
|
uint32_t height)
|
|
{
|
|
const auto usage = mContext->mFormatUsage->GetRBUsage(internalFormat);
|
|
if (!usage) {
|
|
mContext->ErrorInvalidEnum("%s: Invalid `internalFormat`: 0x%04x.", funcName,
|
|
internalFormat);
|
|
return;
|
|
}
|
|
|
|
if (width > mContext->mImplMaxRenderbufferSize ||
|
|
height > mContext->mImplMaxRenderbufferSize)
|
|
{
|
|
mContext->ErrorInvalidValue("%s: Width or height exceeds maximum renderbuffer"
|
|
" size.",
|
|
funcName);
|
|
return;
|
|
}
|
|
|
|
mContext->MakeContextCurrent();
|
|
|
|
if (!usage->maxSamplesKnown) {
|
|
const_cast<webgl::FormatUsageInfo*>(usage)->ResolveMaxSamples(mContext->gl);
|
|
}
|
|
MOZ_ASSERT(usage->maxSamplesKnown);
|
|
|
|
if (samples > usage->maxSamples) {
|
|
mContext->ErrorInvalidValue("%s: `samples` is out of the valid range.", funcName);
|
|
return;
|
|
}
|
|
|
|
// Validation complete.
|
|
|
|
const GLenum error = DoRenderbufferStorage(samples, usage, width, height);
|
|
if (error) {
|
|
const char* errorName = mContext->ErrorName(error);
|
|
mContext->GenerateWarning("%s generated error %s", funcName, errorName);
|
|
return;
|
|
}
|
|
|
|
mSamples = samples;
|
|
mFormat = usage;
|
|
mWidth = width;
|
|
mHeight = height;
|
|
mImageDataStatus = WebGLImageDataStatus::UninitializedImageData;
|
|
|
|
InvalidateStatusOfAttachedFBs();
|
|
}
|
|
|
|
void
|
|
WebGLRenderbuffer::DoFramebufferRenderbuffer(GLenum attachment) const
|
|
{
|
|
gl::GLContext* gl = mContext->gl;
|
|
|
|
if (attachment == LOCAL_GL_DEPTH_STENCIL_ATTACHMENT) {
|
|
const GLuint stencilRB = (mSecondaryRB ? mSecondaryRB : mPrimaryRB);
|
|
gl->fFramebufferRenderbuffer(LOCAL_GL_FRAMEBUFFER,
|
|
LOCAL_GL_DEPTH_ATTACHMENT,
|
|
LOCAL_GL_RENDERBUFFER, mPrimaryRB);
|
|
gl->fFramebufferRenderbuffer(LOCAL_GL_FRAMEBUFFER,
|
|
LOCAL_GL_STENCIL_ATTACHMENT,
|
|
LOCAL_GL_RENDERBUFFER, stencilRB);
|
|
return;
|
|
}
|
|
|
|
gl->fFramebufferRenderbuffer(LOCAL_GL_FRAMEBUFFER, attachment,
|
|
LOCAL_GL_RENDERBUFFER, mPrimaryRB);
|
|
}
|
|
|
|
GLint
|
|
WebGLRenderbuffer::GetRenderbufferParameter(RBTarget target,
|
|
RBParam pname) const
|
|
{
|
|
gl::GLContext* gl = mContext->gl;
|
|
|
|
switch (pname.get()) {
|
|
case LOCAL_GL_RENDERBUFFER_STENCIL_SIZE:
|
|
if (!mFormat)
|
|
return 0;
|
|
|
|
if (!mFormat->format->hasStencil)
|
|
return 0;
|
|
|
|
return 8;
|
|
|
|
case LOCAL_GL_RENDERBUFFER_SAMPLES:
|
|
case LOCAL_GL_RENDERBUFFER_WIDTH:
|
|
case LOCAL_GL_RENDERBUFFER_HEIGHT:
|
|
case LOCAL_GL_RENDERBUFFER_RED_SIZE:
|
|
case LOCAL_GL_RENDERBUFFER_GREEN_SIZE:
|
|
case LOCAL_GL_RENDERBUFFER_BLUE_SIZE:
|
|
case LOCAL_GL_RENDERBUFFER_ALPHA_SIZE:
|
|
case LOCAL_GL_RENDERBUFFER_DEPTH_SIZE:
|
|
{
|
|
gl->fBindRenderbuffer(LOCAL_GL_RENDERBUFFER, mPrimaryRB);
|
|
GLint i = 0;
|
|
gl->fGetRenderbufferParameteriv(target.get(), pname.get(), &i);
|
|
return i;
|
|
}
|
|
|
|
case LOCAL_GL_RENDERBUFFER_INTERNAL_FORMAT:
|
|
{
|
|
GLenum ret = 0;
|
|
if (mFormat) {
|
|
ret = mFormat->format->sizedFormat;
|
|
|
|
if (!mContext->IsWebGL2() && ret == LOCAL_GL_DEPTH24_STENCIL8) {
|
|
ret = LOCAL_GL_DEPTH_STENCIL;
|
|
}
|
|
}
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
MOZ_ASSERT(false, "This function should only be called with valid `pname`.");
|
|
return 0;
|
|
}
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(WebGLRenderbuffer)
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(WebGLRenderbuffer, AddRef)
|
|
NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(WebGLRenderbuffer, Release)
|
|
|
|
} // namespace mozilla
|