Bug 942501 - Part 2: move TextureImageCGL to separate files - r=BenWa

gfx/gl/GLContext.h

@@ -3053,6 +3053,8 @@ public:
 
     void EmptyTexGarbageBin();
 
+    bool IsOffscreenSizeAllowed(const gfxIntSize& aSize) const;
+
 protected:
     nsDataHashtable<nsPtrHashKey<void>, void*> mUserData;
 
@@ -3062,8 +3064,6 @@ protected:
 
     void InitExtensions();
 
-    bool IsOffscreenSizeAllowed(const gfxIntSize& aSize) const;
-
     nsTArray<nsIntRect> mViewportStack;
     nsTArray<nsIntRect> mScissorStack;
 

gfx/gl/GLContextProviderCGL.mm

@@ -5,6 +5,7 @@
 
 #include "GLContextProvider.h"
 #include "GLContext.h"
+#include "TextureImageCGL.h"
 #include "nsDebug.h"
 #include "nsIWidget.h"
 #include "OpenGL/OpenGL.h"
@@ -220,114 +221,6 @@ GLContextCGL::ResizeOffscreen(const gfxIntSize& aNewSize)
     return ResizeScreenBuffer(aNewSize);
 }
 
-class TextureImageCGL : public BasicTextureImage
-{
-    friend already_AddRefed<TextureImage>
-    GLContextCGL::CreateTextureImageInternal(const nsIntSize& aSize,
-                                             TextureImage::ContentType aContentType,
-                                             GLenum aWrapMode,
-                                             TextureImage::Flags aFlags,
-                                             TextureImage::ImageFormat aImageFormat);
-public:
-    ~TextureImageCGL()
-    {
-        if (mPixelBuffer) {
-            mGLContext->MakeCurrent();
-            mGLContext->fDeleteBuffers(1, &mPixelBuffer);
-        }
-    }
-
-protected:
-    already_AddRefed<gfxASurface>
-    GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt)
-    {
-        gfxIntSize size(aSize.width + 1, aSize.height + 1);
-        mGLContext->MakeCurrent();
-        if (!mGLContext->
-            IsExtensionSupported(GLContext::ARB_pixel_buffer_object)) 
-        {
-            return gfxPlatform::GetPlatform()->
-                CreateOffscreenSurface(size,
-                                       gfxASurface::ContentFromFormat(aFmt));
-        }
-
-        if (!mPixelBuffer) {
-            mGLContext->fGenBuffers(1, &mPixelBuffer);
-        }
-        mGLContext->fBindBuffer(LOCAL_GL_PIXEL_UNPACK_BUFFER, mPixelBuffer);
-        int32_t length = size.width * 4 * size.height;
-
-        if (length > mPixelBufferSize) {
-            mGLContext->fBufferData(LOCAL_GL_PIXEL_UNPACK_BUFFER, length,
-                                    NULL, LOCAL_GL_STREAM_DRAW);
-            mPixelBufferSize = length;
-        }
-        unsigned char* data = 
-            (unsigned char*)mGLContext->
-                fMapBuffer(LOCAL_GL_PIXEL_UNPACK_BUFFER, 
-                           LOCAL_GL_WRITE_ONLY);
-
-        mGLContext->fBindBuffer(LOCAL_GL_PIXEL_UNPACK_BUFFER, 0);
-
-        if (!data) {
-            nsAutoCString failure;
-            failure += "Pixel buffer binding failed: ";
-            failure.AppendPrintf("%dx%d\n", size.width, size.height);
-            gfx::LogFailure(failure);
-
-            mGLContext->fBindBuffer(LOCAL_GL_PIXEL_UNPACK_BUFFER, 0);
-            return gfxPlatform::GetPlatform()->
-                CreateOffscreenSurface(size,
-                                       gfxASurface::ContentFromFormat(aFmt));
-        }
-
-        nsRefPtr<gfxQuartzSurface> surf = 
-            new gfxQuartzSurface(data, size, size.width * 4, aFmt);
-
-        mBoundPixelBuffer = true;
-        return surf.forget();
-    }
-  
-    bool 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 FinishedSurfaceUpload()
-    {
-        if (mBoundPixelBuffer) {
-            mGLContext->MakeCurrent();
-            mGLContext->fBindBuffer(LOCAL_GL_PIXEL_UNPACK_BUFFER, 0);
-            mBoundPixelBuffer = false;
-        }
-    }
-
-private:
-    TextureImageCGL(GLuint aTexture,
-                    const nsIntSize& aSize,
-                    GLenum aWrapMode,
-                    ContentType aContentType,
-                    GLContext* aContext,
-                    TextureImage::Flags aFlags = TextureImage::NoFlags,
-                    TextureImage::ImageFormat aImageFormat = gfxImageFormatUnknown)
-        : BasicTextureImage(aTexture, aSize, aWrapMode, aContentType,
-                            aContext, aFlags, aImageFormat)
-        , mPixelBuffer(0)
-        , mPixelBufferSize(0)
-        , mBoundPixelBuffer(false)
-    {}
-    
-    GLuint mPixelBuffer;
-    int32_t mPixelBufferSize;
-    bool mBoundPixelBuffer;
-};
-
 already_AddRefed<TextureImage>
 GLContextCGL::CreateTextureImageInternal(const nsIntSize& aSize,
                                          TextureImage::ContentType aContentType,

gfx/gl/TextureImageCGL.h

@@ -0,0 +1,51 @@
+/* -*- 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/. */
+
+#ifndef TextureImageCGL_h_
+#define TextureImageCGL_h_
+
+#include "GLTextureImage.h"
+#include "GLContextTypes.h"
+#include "nsAutoPtr.h"
+#include "nsSize.h"
+
+class gfxASurface;
+
+namespace mozilla {
+namespace gl {
+
+class TextureImageCGL : public BasicTextureImage
+{
+public:
+
+    TextureImageCGL(GLuint aTexture,
+                    const nsIntSize& aSize,
+                    GLenum aWrapMode,
+                    ContentType aContentType,
+                    GLContext* aContext,
+                    TextureImage::Flags aFlags = TextureImage::NoFlags,
+                    TextureImage::ImageFormat aImageFormat = gfxImageFormatUnknown);
+
+    ~TextureImageCGL();
+
+protected:
+    already_AddRefed<gfxASurface>
+    GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt);
+
+    bool FinishedSurfaceUpdate();
+
+    void FinishedSurfaceUpload();
+
+private:
+
+    GLuint mPixelBuffer;
+    int32_t mPixelBufferSize;
+    bool mBoundPixelBuffer;
+};
+
+}
+}
+
+#endif

gfx/gl/TextureImageCGL.mm

@@ -0,0 +1,110 @@
+/* -*- 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 "gfxQuartzSurface.h"
+#include "gfxPlatform.h"
+#include "gfxFailure.h"
+
+namespace mozilla {
+namespace gl {
+
+TextureImageCGL::TextureImageCGL(GLuint aTexture,
+                const nsIntSize& aSize,
+                GLenum aWrapMode,
+                ContentType aContentType,
+                GLContext* aContext,
+                TextureImage::Flags aFlags,
+                TextureImage::ImageFormat aImageFormat)
+    : BasicTextureImage(aTexture, aSize, aWrapMode, aContentType,
+                        aContext, aFlags, aImageFormat)
+    , mPixelBuffer(0)
+    , mPixelBufferSize(0)
+    , mBoundPixelBuffer(false)
+{}
+
+TextureImageCGL::~TextureImageCGL()
+{
+    if (mPixelBuffer) {
+        mGLContext->MakeCurrent();
+        mGLContext->fDeleteBuffers(1, &mPixelBuffer);
+    }
+}
+
+already_AddRefed<gfxASurface>
+TextureImageCGL::GetSurfaceForUpdate(const gfxIntSize& aSize, ImageFormat aFmt)
+{
+    gfxIntSize size(aSize.width + 1, aSize.height + 1);
+    mGLContext->MakeCurrent();
+    if (!mGLContext->
+        IsExtensionSupported(GLContext::ARB_pixel_buffer_object))
+    {
+        return gfxPlatform::GetPlatform()->
+            CreateOffscreenSurface(size,
+                                    gfxASurface::ContentFromFormat(aFmt));
+    }
+
+    if (!mPixelBuffer) {
+        mGLContext->fGenBuffers(1, &mPixelBuffer);
+    }
+    mGLContext->fBindBuffer(LOCAL_GL_PIXEL_UNPACK_BUFFER, mPixelBuffer);
+    int32_t length = size.width * 4 * size.height;
+
+    if (length > mPixelBufferSize) {
+        mGLContext->fBufferData(LOCAL_GL_PIXEL_UNPACK_BUFFER, length,
+                                NULL, LOCAL_GL_STREAM_DRAW);
+        mPixelBufferSize = length;
+    }
+    unsigned char* data =
+        (unsigned char*)mGLContext->
+            fMapBuffer(LOCAL_GL_PIXEL_UNPACK_BUFFER,
+                        LOCAL_GL_WRITE_ONLY);
+
+    mGLContext->fBindBuffer(LOCAL_GL_PIXEL_UNPACK_BUFFER, 0);
+
+    if (!data) {
+        nsAutoCString failure;
+        failure += "Pixel buffer binding failed: ";
+        failure.AppendPrintf("%dx%d\n", size.width, size.height);
+        gfx::LogFailure(failure);
+
+        mGLContext->fBindBuffer(LOCAL_GL_PIXEL_UNPACK_BUFFER, 0);
+        return gfxPlatform::GetPlatform()->
+            CreateOffscreenSurface(size,
+                                    gfxASurface::ContentFromFormat(aFmt));
+    }
+
+    nsRefPtr<gfxQuartzSurface> surf =
+        new gfxQuartzSurface(data, size, size.width * 4, aFmt);
+
+    mBoundPixelBuffer = true;
+    return surf.forget();
+}
+
+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;
+    }
+}
+
+}
+}

gfx/gl/moz.build

@@ -80,10 +80,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     LOCAL_INCLUDES += ['/widget/gonk']
 
 if gl_provider == 'CGL':
-    # This file includes Mac headers that are unfriendly to unified builds,
-    # and we have only one .mm file here anyway.
+    # These files include Mac headers that are unfriendly to unified builds
     SOURCES += [
-        "GLContextProvider%s.mm" % (gl_provider),
+        "GLContextProviderCGL.mm",
+        "TextureImageCGL.mm"
     ]
     EXPORTS += [
         'SharedSurfaceIO.h',