mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 05:41:12 +00:00
01583602a9
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout. The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.
CLOSED TREE makes big refactorings like this a piece of cake.
# The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
xargs perl -p -i -e '
s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
s/nsRefPtr ?</RefPtr</g; # handle declarations and variables
'
# Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h
# Handle nsRefPtr.h itself, a couple places that define constructors
# from nsRefPtr, and code generators specially. We do this here, rather
# than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
# things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
mfbt/nsRefPtr.h \
xpcom/glue/nsCOMPtr.h \
xpcom/base/OwningNonNull.h \
ipc/ipdl/ipdl/lower.py \
ipc/ipdl/ipdl/builtin.py \
dom/bindings/Codegen.py \
python/lldbutils/lldbutils/utils.py
# In our indiscriminate substitution above, we renamed
# nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'
if [ -d .git ]; then
git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi
--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
112 lines
3.6 KiB
Plaintext
112 lines
3.6 KiB
Plaintext
/* -*- 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 "TextureImageCGL.h"
|
|
#include "GLContext.h"
|
|
#include "gfx2DGlue.h"
|
|
#include "gfxQuartzSurface.h"
|
|
#include "gfxPlatform.h"
|
|
#include "gfxFailure.h"
|
|
|
|
namespace mozilla {
|
|
|
|
using namespace gfx;
|
|
|
|
namespace gl {
|
|
|
|
TextureImageCGL::TextureImageCGL(GLuint aTexture,
|
|
const IntSize& aSize,
|
|
GLenum aWrapMode,
|
|
ContentType aContentType,
|
|
GLContext* aContext,
|
|
TextureImage::Flags aFlags,
|
|
TextureImage::ImageFormat aImageFormat)
|
|
: BasicTextureImage(aTexture, aSize, aWrapMode, aContentType,
|
|
aContext, aFlags, aImageFormat)
|
|
, mPixelBuffer(0)
|
|
, mBoundPixelBuffer(false)
|
|
{}
|
|
|
|
TextureImageCGL::~TextureImageCGL()
|
|
{
|
|
if (mPixelBuffer) {
|
|
mGLContext->MakeCurrent();
|
|
mGLContext->fDeleteBuffers(1, &mPixelBuffer);
|
|
}
|
|
}
|
|
|
|
bool
|
|
TextureImageCGL::FinishedSurfaceUpdate()
|
|
{
|
|
if (mBoundPixelBuffer) {
|
|
mGLContext->MakeCurrent();
|
|
mGLContext->fBindBuffer(LOCAL_GL_PIXEL_UNPACK_BUFFER, mPixelBuffer);
|
|
mGLContext->fUnmapBuffer(LOCAL_GL_PIXEL_UNPACK_BUFFER);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void
|
|
TextureImageCGL::FinishedSurfaceUpload()
|
|
{
|
|
if (mBoundPixelBuffer) {
|
|
mGLContext->MakeCurrent();
|
|
mGLContext->fBindBuffer(LOCAL_GL_PIXEL_UNPACK_BUFFER, 0);
|
|
mBoundPixelBuffer = false;
|
|
}
|
|
}
|
|
|
|
already_AddRefed<TextureImage>
|
|
CreateTextureImageCGL(GLContext* gl,
|
|
const gfx::IntSize& aSize,
|
|
TextureImage::ContentType aContentType,
|
|
GLenum aWrapMode,
|
|
TextureImage::Flags aFlags,
|
|
TextureImage::ImageFormat aImageFormat)
|
|
{
|
|
if (!gl->IsOffscreenSizeAllowed(aSize) &&
|
|
gfxPlatform::OffMainThreadCompositingEnabled()) {
|
|
NS_ASSERTION(aWrapMode == LOCAL_GL_CLAMP_TO_EDGE, "Can't support wrapping with tiles!");
|
|
RefPtr<TextureImage> t = new gl::TiledTextureImage(gl, aSize, aContentType,
|
|
aFlags, aImageFormat);
|
|
return t.forget();
|
|
}
|
|
|
|
return CreateBasicTextureImage(gl, aSize, aContentType, aWrapMode,
|
|
aFlags, aImageFormat);
|
|
}
|
|
|
|
already_AddRefed<TextureImage>
|
|
TileGenFuncCGL(GLContext *gl,
|
|
const IntSize& aSize,
|
|
TextureImage::ContentType aContentType,
|
|
TextureImage::Flags aFlags,
|
|
TextureImage::ImageFormat aImageFormat)
|
|
{
|
|
bool useNearestFilter = aFlags & TextureImage::UseNearestFilter;
|
|
gl->MakeCurrent();
|
|
|
|
GLuint texture;
|
|
gl->fGenTextures(1, &texture);
|
|
|
|
gl->fActiveTexture(LOCAL_GL_TEXTURE0);
|
|
gl->fBindTexture(LOCAL_GL_TEXTURE_2D, texture);
|
|
|
|
GLint texfilter = useNearestFilter ? LOCAL_GL_NEAREST : LOCAL_GL_LINEAR;
|
|
gl->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_MIN_FILTER, texfilter);
|
|
gl->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_MAG_FILTER, texfilter);
|
|
gl->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_WRAP_S, LOCAL_GL_CLAMP_TO_EDGE);
|
|
gl->fTexParameteri(LOCAL_GL_TEXTURE_2D, LOCAL_GL_TEXTURE_WRAP_T, LOCAL_GL_CLAMP_TO_EDGE);
|
|
|
|
RefPtr<TextureImageCGL> teximage
|
|
(new TextureImageCGL(texture, aSize, LOCAL_GL_CLAMP_TO_EDGE, aContentType,
|
|
gl, aFlags, aImageFormat));
|
|
return teximage.forget();
|
|
}
|
|
|
|
} // namespace gl
|
|
} // namespace mozilla
|