mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 11:32:04 +00:00
0f5f4e8645
We've had complaints that our Cogl code/headers are a bit "special" so
this is a first pass at tidying things up by giving them some
consistency. These changes are all consistent with how new code in Cogl
is being written, but the style isn't consistently applied across all
code yet.
There are two parts to this patch; but since each one required a large
amount of effort to maintain tidy indenting it made sense to combine the
changes to reduce the time spent re indenting the same lines.
The first change is to use a consistent style for declaring function
prototypes in headers. Cogl headers now consistently use this style for
prototypes:
return_type
cogl_function_name (CoglType arg0,
CoglType arg1);
Not everyone likes this style, but it seems that most of the currently
active Cogl developers agree on it.
The second change is to constrain the use of redundant glib data types
in Cogl. Uses of gint, guint, gfloat, glong, gulong and gchar have all
been replaced with int, unsigned int, float, long, unsigned long and char
respectively. When talking about pixel data; use of guchar has been
replaced with guint8, otherwise unsigned char can be used.
The glib types that we continue to use for portability are gboolean,
gint{8,16,32,64}, guint{8,16,32,64} and gsize.
The general intention is that Cogl should look palatable to the widest
range of C programmers including those outside the Gnome community so
- especially for the public API - we want to minimize the number of
foreign looking typedefs.
103 lines
3.4 KiB
C
103 lines
3.4 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, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*
|
|
* Authors:
|
|
* Damien Lespiau <damien.lespiau@intel.com>
|
|
*/
|
|
|
|
#ifndef __COGL_BUFFER_PRIVATE_H__
|
|
#define __COGL_BUFFER_PRIVATE_H__
|
|
|
|
#include <glib.h>
|
|
|
|
#include "cogl-handle.h"
|
|
#include "cogl-buffer.h"
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define COGL_BUFFER(buffer) ((CoglBuffer *)(buffer))
|
|
|
|
#define COGL_BUFFER_SET_FLAG(buffer, flag) \
|
|
((buffer)->flags |= (COGL_BUFFER_FLAG_ ## flag))
|
|
|
|
#define COGL_BUFFER_CLEAR_FLAG(buffer, flag) \
|
|
((buffer)->flags &= ~(COGL_BUFFER_FLAG_ ## flag))
|
|
|
|
#define COGL_BUFFER_FLAG_IS_SET(buffer, flag) \
|
|
((buffer)->flags & (COGL_BUFFER_FLAG_ ## flag))
|
|
|
|
typedef struct _CoglBuffer CoglBuffer;
|
|
typedef struct _CoglBufferVtable CoglBufferVtable;
|
|
|
|
struct _CoglBufferVtable
|
|
{
|
|
guint8 * (* map) (CoglBuffer *buffer,
|
|
CoglBufferAccess access);
|
|
|
|
void (* unmap) (CoglBuffer *buffer);
|
|
|
|
gboolean (* set_data) (CoglBuffer *buffer,
|
|
unsigned int offset,
|
|
const guint8 *data,
|
|
unsigned int size);
|
|
};
|
|
|
|
typedef enum _CoglBufferFlags
|
|
{
|
|
COGL_BUFFER_FLAG_NONE = 0,
|
|
COGL_BUFFER_FLAG_BUFFER_OBJECT = 1UL << 0, /* real openGL buffer object */
|
|
COGL_BUFFER_FLAG_MAPPED = 1UL << 1
|
|
} CoglBufferFlags;
|
|
|
|
struct _CoglBuffer
|
|
{
|
|
CoglHandleObject _parent;
|
|
const CoglBufferVtable *vtable;
|
|
|
|
CoglBufferFlags flags;
|
|
|
|
GLuint gl_handle; /* OpenGL handle */
|
|
unsigned int size; /* size of the buffer, in bytes */
|
|
CoglBufferUsageHint usage_hint;
|
|
CoglBufferUpdateHint update_hint;
|
|
|
|
guint8 *data; /* points to the mapped memory when
|
|
* the CoglBuffer is a VBO, PBO, ... or
|
|
* points to allocated memory in the
|
|
* fallback paths */
|
|
};
|
|
|
|
void _cogl_buffer_initialize (CoglBuffer *buffer,
|
|
unsigned int size,
|
|
CoglBufferUsageHint usage_hint,
|
|
CoglBufferUpdateHint update_hint);
|
|
void _cogl_buffer_fini (CoglBuffer *buffer);
|
|
void _cogl_buffer_bind (CoglBuffer *buffer,
|
|
GLenum target);
|
|
GLenum _cogl_buffer_access_to_gl_enum (CoglBufferAccess access);
|
|
GLenum _cogl_buffer_hints_to_gl_enum (CoglBufferUsageHint usage_hint,
|
|
CoglBufferUpdateHint update_hint);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __COGL_BUFFER_PRIVATE_H__ */
|