mirror of
https://github.com/brl/mutter.git
synced 2024-09-20 14:35:48 -04: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>
111 lines
3.2 KiB
C
111 lines
3.2 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:
|
|
* Robert Bragg <robert@linux.intel.com>
|
|
*/
|
|
|
|
#ifndef __COGL_ATTRIBUTE_PRIVATE_H
|
|
#define __COGL_ATTRIBUTE_PRIVATE_H
|
|
|
|
#include "cogl-object-private.h"
|
|
#include "cogl-attribute.h"
|
|
#include "cogl-framebuffer.h"
|
|
|
|
typedef enum
|
|
{
|
|
COGL_ATTRIBUTE_NAME_ID_POSITION_ARRAY,
|
|
COGL_ATTRIBUTE_NAME_ID_COLOR_ARRAY,
|
|
COGL_ATTRIBUTE_NAME_ID_TEXTURE_COORD_ARRAY,
|
|
COGL_ATTRIBUTE_NAME_ID_NORMAL_ARRAY,
|
|
COGL_ATTRIBUTE_NAME_ID_CUSTOM_ARRAY
|
|
} CoglAttributeNameID;
|
|
|
|
typedef struct _CoglAttributeNameState
|
|
{
|
|
char *name;
|
|
CoglAttributeNameID name_id;
|
|
int name_index;
|
|
gboolean normalized_default;
|
|
int texture_unit;
|
|
} CoglAttributeNameState;
|
|
|
|
struct _CoglAttribute
|
|
{
|
|
CoglObject _parent;
|
|
|
|
CoglAttributeBuffer *attribute_buffer;
|
|
const CoglAttributeNameState *name_state;
|
|
gsize stride;
|
|
gsize offset;
|
|
int n_components;
|
|
CoglAttributeType type;
|
|
gboolean normalized;
|
|
|
|
int immutable_ref;
|
|
};
|
|
|
|
typedef enum
|
|
{
|
|
COGL_DRAW_SKIP_JOURNAL_FLUSH = 1 << 0,
|
|
COGL_DRAW_SKIP_PIPELINE_VALIDATION = 1 << 1,
|
|
COGL_DRAW_SKIP_FRAMEBUFFER_FLUSH = 1 << 2,
|
|
COGL_DRAW_SKIP_LEGACY_STATE = 1 << 3,
|
|
/* By default the vertex attribute drawing code will assume that if
|
|
there is a color attribute array enabled then we can't determine
|
|
if the colors will be opaque so we need to enabling
|
|
blending. However when drawing from the journal we know what the
|
|
contents of the color array is so we can override this by passing
|
|
this flag. */
|
|
COGL_DRAW_COLOR_ATTRIBUTE_IS_OPAQUE = 1 << 4
|
|
} CoglDrawFlags;
|
|
|
|
/* During CoglContext initialization we register the "cogl_color_in"
|
|
* attribute name so it gets a global name_index of 0. We need to know
|
|
* the name_index for "cogl_color_in" in
|
|
* _cogl_pipeline_flush_gl_state() */
|
|
#define COGL_ATTRIBUTE_COLOR_NAME_INDEX 0
|
|
|
|
CoglAttributeNameState *
|
|
_cogl_attribute_register_attribute_name (CoglContext *context,
|
|
const char *name);
|
|
|
|
CoglAttribute *
|
|
_cogl_attribute_immutable_ref (CoglAttribute *attribute);
|
|
|
|
void
|
|
_cogl_attribute_immutable_unref (CoglAttribute *attribute);
|
|
|
|
void
|
|
_cogl_attribute_disable_cached_arrays (void);
|
|
|
|
void
|
|
_cogl_flush_attributes_state (CoglFramebuffer *framebuffer,
|
|
CoglPipeline *pipeline,
|
|
CoglDrawFlags flags,
|
|
CoglAttribute **attributes,
|
|
int n_attributes);
|
|
|
|
#endif /* __COGL_ATTRIBUTE_PRIVATE_H */
|
|
|