mirror of
https://github.com/brl/mutter.git
synced 2024-11-30 03:50:47 -05:00
3700cc26a5
The idea is that CoglPixelBuffer should just be a buffer that can be used for pixel data and it has no idea about the details of any images that are stored in it. This is analogous to CoglAttributeBuffer which itself does not have any information about the attributes. When you want to use a pixel buffer you should create a CoglBitmap which points to a region of the attribute buffer and provides the extra needed information such as the width, height and format. That way it is also possible to use a single CoglPixelBuffer with multiple bitmaps. The changes that are made are: • cogl_pixel_buffer_new_with_size has been removed and in its place is cogl_bitmap_new_with_size. This will create a pixel buffer at the right size and rowstride for the given width/height/format and immediately create a single CoglBitmap to point into it. The old function had an out-parameter for the stride of the image but with the new API this should be queriable from the bitmap (although there is no function for this yet). • There is now a public cogl_pixel_buffer_new constructor. This takes a size in bytes and data pointer similarly to cogl_attribute_buffer_new. • cogl_texture_new_from_buffer has been removed. If you want to create a texture from a pixel buffer you should wrap it up in a bitmap first. There is already API to create a texture from a bitmap. This patch also does a bit of header juggling because cogl-context.h was including cogl-texture.h and cogl-framebuffer.h which were causing some circular dependencies when cogl-bitmap.h includes cogl-context.h. These weren't actually needed in cogl-context.h itself but a few other headers were relying on them being included so this adds the #includes where necessary. Reviewed-by: Robert Bragg <robert@linux.intel.com>
112 lines
2.9 KiB
C
112 lines
2.9 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2010 Intel Corporation.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*
|
|
*
|
|
* Authors:
|
|
* Damien Lespiau <damien.lespiau@intel.com>
|
|
* Robert Bragg <robert@linux.intel.com>
|
|
*/
|
|
|
|
/* For an overview of the functionality implemented here, please see
|
|
* cogl-buffer-array.h, which contains the gtk-doc section overview for the
|
|
* Pixel Buffers API.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <glib.h>
|
|
|
|
#include "cogl-private.h"
|
|
#include "cogl-util.h"
|
|
#include "cogl-context-private.h"
|
|
#include "cogl-object.h"
|
|
#include "cogl-pixel-buffer-private.h"
|
|
#include "cogl-pixel-buffer.h"
|
|
|
|
/*
|
|
* GL/GLES compatibility defines for the buffer API:
|
|
*/
|
|
|
|
#if defined (HAVE_COGL_GL)
|
|
|
|
#ifndef GL_PIXEL_UNPACK_BUFFER
|
|
#define GL_PIXEL_UNPACK_BUFFER GL_PIXEL_UNPACK_BUFFER_ARB
|
|
#endif
|
|
|
|
#ifndef GL_PIXEL_PACK_BUFFER
|
|
#define GL_PIXEL_PACK_BUFFER GL_PIXEL_PACK_BUFFER_ARB
|
|
#endif
|
|
|
|
#endif
|
|
|
|
static void
|
|
_cogl_pixel_buffer_free (CoglPixelBuffer *buffer);
|
|
|
|
COGL_BUFFER_DEFINE (PixelBuffer, pixel_buffer)
|
|
|
|
CoglPixelBuffer *
|
|
cogl_pixel_buffer_new (CoglContext *context,
|
|
gsize size,
|
|
const void *data)
|
|
{
|
|
CoglPixelBuffer *pixel_buffer = g_slice_new0 (CoglPixelBuffer);
|
|
CoglBuffer *buffer = COGL_BUFFER (pixel_buffer);
|
|
gboolean use_malloc;
|
|
|
|
if (!(context->private_feature_flags & COGL_PRIVATE_FEATURE_PBOS))
|
|
use_malloc = TRUE;
|
|
else
|
|
use_malloc = FALSE;
|
|
|
|
/* parent's constructor */
|
|
_cogl_buffer_initialize (buffer,
|
|
context,
|
|
size,
|
|
use_malloc,
|
|
COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK,
|
|
COGL_BUFFER_USAGE_HINT_TEXTURE,
|
|
COGL_BUFFER_UPDATE_HINT_STATIC);
|
|
|
|
_cogl_pixel_buffer_object_new (pixel_buffer);
|
|
|
|
if (data)
|
|
cogl_buffer_set_data (COGL_BUFFER (pixel_buffer),
|
|
0,
|
|
data,
|
|
size);
|
|
|
|
return pixel_buffer;
|
|
}
|
|
|
|
static void
|
|
_cogl_pixel_buffer_free (CoglPixelBuffer *buffer)
|
|
{
|
|
/* parent's destructor */
|
|
_cogl_buffer_fini (COGL_BUFFER (buffer));
|
|
|
|
g_slice_free (CoglPixelBuffer, buffer);
|
|
}
|
|
|