Bug 858914 - New texture classes + OGL backend (preffed off). r=bas, nrc

2013-07-30 11:59:51 +02:00
parent b223e861f2
commit c039b2a50f
72 changed files with 3710 additions and 291 deletions
--- a/gfx/layers/ImageDataSerializer.cpp
+++ b/gfx/layers/ImageDataSerializer.cpp
@@ -0,0 +1,129 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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 "mozilla/layers/ImageDataSerializer.h"
+#include "gfxImageSurface.h"
+#include "mozilla/gfx/2D.h"
+#include "gfx2DGlue.h"
+#include "mozilla/gfx/Tools.h"
+
+namespace mozilla {
+namespace layers {
+
+// The Data is layed out as follows:
+//
+//  +-------------------+   -++ --+   <-- ImageDataSerializerBase::mData pointer
+//  | SurfaceBufferInfo |     |   |
+//  +-------------------+   --+   | offset
+//  |        ...        |         |
+//  +-------------------+   ------+
+//  |                   |
+//  |       data        |
+//  |                   |
+//  +-------------------+
+
+// Structure written at the beginning of the data blob containing the image
+// (as shown in the figure above). It contains the necessary informations to
+// read the image in the blob.
+namespace {
+struct SurfaceBufferInfo
+{
+  uint32_t width;
+  uint32_t height;
+  gfx::SurfaceFormat format;
+
+  static uint32_t GetOffset()
+  {
+    return gfx::GetAlignedStride<16>(sizeof(SurfaceBufferInfo));
+  }
+};
+} // anonymous namespace
+
+static SurfaceBufferInfo* GetBufferInfo(uint8_t* aBuffer)
+{
+  return reinterpret_cast<SurfaceBufferInfo*>(aBuffer);
+}
+
+
+void
+ImageDataSerializer::InitializeBufferInfo(gfx::IntSize aSize,
+                                          gfx::SurfaceFormat aFormat)
+{
+  SurfaceBufferInfo* info = GetBufferInfo(mData);
+  info->width = aSize.width;
+  info->height = aSize.height;
+  info->format = aFormat;
+}
+
+uint32_t
+ImageDataSerializer::ComputeMinBufferSize(gfx::IntSize aSize,
+                                          gfx::SurfaceFormat aFormat)
+{
+  // Note that at the moment we pack the image data with the minimum possible
+  // stride, we may decide to change that if we want aligned stride.
+  gfxIntSize gfxSize = gfxIntSize(aSize.width, aSize.height);
+  uint32_t bufsize = aSize.height * gfx::BytesPerPixel(aFormat) * aSize.width;
+  return SurfaceBufferInfo::GetOffset()
+       + gfx::GetAlignedStride<16>(bufsize);
+}
+
+bool
+ImageDataSerializerBase::IsValid() const
+{
+  // XXX - We could use some sanity checks here.
+  return !!mData;
+}
+
+uint8_t*
+ImageDataSerializerBase::GetData()
+{
+  MOZ_ASSERT(IsValid());
+  return mData + SurfaceBufferInfo::GetOffset();
+}
+
+gfx::IntSize
+ImageDataSerializerBase::GetSize() const
+{
+  MOZ_ASSERT(IsValid());
+  SurfaceBufferInfo* info = GetBufferInfo(mData);
+  return gfx::IntSize(info->width, info->height);
+}
+
+gfx::SurfaceFormat
+ImageDataSerializerBase::GetFormat() const
+{
+  MOZ_ASSERT(IsValid());
+  return GetBufferInfo(mData)->format;
+}
+
+TemporaryRef<gfxImageSurface>
+ImageDataSerializerBase::GetAsThebesSurface()
+{
+  MOZ_ASSERT(IsValid());
+  SurfaceBufferInfo* info = GetBufferInfo(mData);
+  uint32_t stride = gfxASurface::BytesPerPixel(
+    gfx::SurfaceFormatToImageFormat(GetFormat())) * info->width;
+  gfxIntSize size(info->width, info->height);
+  RefPtr<gfxImageSurface> surf =
+    new gfxImageSurface(GetData(), size, stride,
+                        gfx::SurfaceFormatToImageFormat(GetFormat()));
+  return surf.forget();
+}
+
+TemporaryRef<gfx::DataSourceSurface>
+ImageDataSerializerBase::GetAsSurface()
+{
+  MOZ_ASSERT(IsValid());
+  SurfaceBufferInfo* info = GetBufferInfo(mData);
+  gfx::IntSize size(info->width, info->height);
+  uint32_t stride = gfxASurface::BytesPerPixel(
+    gfx::SurfaceFormatToImageFormat(GetFormat())) * info->width;
+  RefPtr<gfx::DataSourceSurface> surf =
+    gfx::Factory::CreateWrappingDataSourceSurface(GetData(), stride, size, GetFormat());
+  return surf.forget();
+}
+
+} // namespace layers
+} // namespace mozilla