зеркало из https://github.com/mozilla/gecko-dev.git
Bug 788042 - Use MOZ_X11 instead of MOZ_WIDGET_GTK2 under gfx/layers. r=karlt
This commit is contained in:
Родитель
28e2169fa7
Коммит
70c621a038
|
@ -84,7 +84,7 @@ CanvasLayerOGL::Initialize(const Data& aData)
|
|||
} else if (aData.mSurface) {
|
||||
mCanvasSurface = aData.mSurface;
|
||||
mNeedsYFlip = false;
|
||||
#if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
|
||||
#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
|
||||
if (aData.mSurface->GetType() == gfxASurface::SurfaceTypeXlib) {
|
||||
gfxXlibSurface *xsurf = static_cast<gfxXlibSurface*>(aData.mSurface);
|
||||
mPixmap = xsurf->GetGLXPixmap();
|
||||
|
@ -180,7 +180,7 @@ CanvasLayerOGL::UpdateSurface()
|
|||
return;
|
||||
}
|
||||
|
||||
#if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
|
||||
#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
|
||||
if (mPixmap) {
|
||||
return;
|
||||
}
|
||||
|
@ -286,7 +286,7 @@ CanvasLayerOGL::RenderLayer(int aPreviousDestination,
|
|||
program = mOGLManager->GetProgram(mLayerProgram, GetMaskLayer());
|
||||
}
|
||||
|
||||
#if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
|
||||
#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
|
||||
if (mPixmap && !mDelayedUpdates) {
|
||||
sGLXLibrary.BindTexImage(mPixmap);
|
||||
}
|
||||
|
@ -312,7 +312,7 @@ CanvasLayerOGL::RenderLayer(int aPreviousDestination,
|
|||
mOGLManager->BindAndDrawQuadWithTextureRect(program, drawRect, drawRect.Size());
|
||||
}
|
||||
|
||||
#if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
|
||||
#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
|
||||
if (mPixmap && !mDelayedUpdates) {
|
||||
sGLXLibrary.ReleaseTexImage(mPixmap);
|
||||
}
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
#include "LayerManagerOGL.h"
|
||||
#include "gfxASurface.h"
|
||||
#if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
|
||||
#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
|
||||
#include "GLXLibrary.h"
|
||||
#include "mozilla/X11Util.h"
|
||||
#endif
|
||||
|
@ -30,7 +30,7 @@ public:
|
|||
mTexture(0),
|
||||
mTextureTarget(LOCAL_GL_TEXTURE_2D),
|
||||
mDelayedUpdates(false)
|
||||
#if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
|
||||
#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
|
||||
,mPixmap(0)
|
||||
#endif
|
||||
{
|
||||
|
@ -64,7 +64,7 @@ protected:
|
|||
bool mGLBufferIsPremultiplied;
|
||||
bool mNeedsYFlip;
|
||||
bool mForceReadback;
|
||||
#if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
|
||||
#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
|
||||
GLXPixmap mPixmap;
|
||||
#endif
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче