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>
127 lines
3.9 KiB
C
127 lines
3.9 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2008,2009,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>
|
|
*/
|
|
|
|
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
|
|
#error "Only <cogl/cogl.h> can be included directly."
|
|
#endif
|
|
|
|
#ifndef __COGL_PIXEL_BUFFER_H__
|
|
#define __COGL_PIXEL_BUFFER_H__
|
|
|
|
#include <glib.h>
|
|
#include <cogl/cogl-types.h>
|
|
#include <cogl/cogl-context.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
/* All of the cogl-pixel-buffer API is currently experimental so we
|
|
* suffix the actual symbols with _EXP so if somone is monitoring for
|
|
* ABI changes it will hopefully be clearer to them what's going on if
|
|
* any of the symbols dissapear at a later date.
|
|
*/
|
|
|
|
#define cogl_pixel_buffer_new cogl_pixel_buffer_new_EXP
|
|
#define cogl_pixel_buffer_new_with_size cogl_pixel_buffer_new_with_size_EXP
|
|
#define cogl_is_pixel_buffer cogl_is_pixel_buffer_EXP
|
|
#if 0
|
|
#define cogl_pixel_buffer_set_region cogl_pixel_buffer_set_region_EXP
|
|
#endif
|
|
|
|
typedef struct _CoglPixelBuffer CoglPixelBuffer;
|
|
|
|
/**
|
|
* cogl_pixel_buffer_new:
|
|
* @context: A #CoglContext
|
|
* @size: The number of bytes to allocate for the pixel data.
|
|
* @data: An optional pointer to vertex data to upload immediately
|
|
*
|
|
* Declares a new #CoglPixelBuffer of @size bytes to contain arrays of
|
|
* pixels. Once declared, data can be set using cogl_buffer_set_data()
|
|
* or by mapping it into the application's address space using
|
|
* cogl_buffer_map().
|
|
*
|
|
* If @data isn't %NULL then @size bytes will be read from @data and
|
|
* immediately copied into the new buffer.
|
|
*
|
|
* Since: 1.10
|
|
* Stability: unstable
|
|
*/
|
|
CoglPixelBuffer *
|
|
cogl_pixel_buffer_new (CoglContext *context,
|
|
gsize size,
|
|
const void *data);
|
|
|
|
/**
|
|
* cogl_is_pixel_buffer:
|
|
* @object: a #CoglObject to test
|
|
*
|
|
* Checks whether @handle is a pixel array.
|
|
*
|
|
* Return value: %TRUE if the @handle is a pixel array, and %FALSE
|
|
* otherwise
|
|
*
|
|
* Since: 1.2
|
|
* Stability: Unstable
|
|
*/
|
|
gboolean
|
|
cogl_is_pixel_buffer (void *object);
|
|
|
|
#if 0
|
|
/*
|
|
* cogl_pixel_buffer_set_region:
|
|
* @array: the #CoglHandle of a pixel array
|
|
* @data: pixel data to upload to @array
|
|
* @src_width: width in pixels of the region to update
|
|
* @src_height: height in pixels of the region to update
|
|
* @src_rowstride: row stride in bytes of the source array
|
|
* @dst_x: upper left destination horizontal coordinate
|
|
* @dst_y: upper left destination vertical coordinate
|
|
*
|
|
* Uploads new data into a pixel array. The source data pointed by @data can
|
|
* have a different stride than @array in which case the function will do the
|
|
* right thing for you. For performance reasons, it is recommended for the
|
|
* source data to have the same stride than @array.
|
|
*
|
|
* Return value: %TRUE if the upload succeeded, %FALSE otherwise
|
|
*
|
|
* Since: 1.2
|
|
* Stability: Unstable
|
|
*/
|
|
gboolean
|
|
cogl_pixel_buffer_set_region (CoglHandle array,
|
|
guint8 *data,
|
|
unsigned int src_width,
|
|
unsigned int src_height,
|
|
unsigned int src_rowstride,
|
|
unsigned int dst_x,
|
|
unsigned int dst_y);
|
|
#endif
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __COGL_PIXEL_BUFFER_H__ */
|