Bug 877115 - Remove GetTexImage from GLContext helper. r=nical

This commit is contained in:
Andreas Pehrson
2014-01-08 09:37:58 +01:00
parent 46e31a8029
commit 1cde164801
11 changed files with 77 additions and 71 deletions

View File

@@ -6,8 +6,11 @@
#include "CompositingRenderTargetOGL.h"
#include "GLContext.h"
#include "GLReadTexImageHelper.h"
#include "mozilla/gfx/2D.h"
using namespace mozilla;
using namespace mozilla::gfx;
using namespace mozilla::gl;
using namespace mozilla::layers;
CompositingRenderTargetOGL::~CompositingRenderTargetOGL()
@@ -57,12 +60,12 @@ CompositingRenderTargetOGL::BindRenderTarget()
}
#ifdef MOZ_DUMP_PAINTING
already_AddRefed<gfxImageSurface>
TemporaryRef<DataSourceSurface>
CompositingRenderTargetOGL::Dump(Compositor* aCompositor)
{
MOZ_ASSERT(mInitParams.mStatus == InitParams::INITIALIZED);
CompositorOGL* compositorOGL = static_cast<CompositorOGL*>(aCompositor);
return GetTexImage(mGL, mTextureHandle, true, compositorOGL->GetFBOFormat());
return ReadBackSurface(mGL, mTextureHandle, true, compositorOGL->GetFBOFormat());
}
#endif