0bce7eac53
As part of an incremental process to have Cogl be a standalone project we
want to re-consider how we organise the Cogl source code.
Currently this is the structure I'm aiming for:
cogl/
cogl/
<put common source here>
winsys/
cogl-glx.c
cogl-wgl.c
driver/
gl/
gles/
os/ ?
utils/
cogl-fixed
cogl-matrix-stack?
cogl-journal?
cogl-primitives?
pango/
The new winsys component is a starting point for migrating window system
code (i.e. x11,glx,wgl,osx,egl etc) from Clutter to Cogl.
The utils/ and pango/ directories aren't added by this commit, but they are
noted because I plan to add them soon.
Overview of the planned structure:
* The winsys/ API is the API that binds OpenGL to a specific window system,
be that X11 or win32 etc. Example are glx, wgl and egl. Much of the logic
under clutter/{glx,osx,win32 etc} should migrate here.
* Note there is also the idea of a winsys-base that may represent a window
system for which there are multiple winsys APIs. An example of this is
x11, since glx and egl may both be used with x11. (currently only Clutter
has the idea of a winsys-base)
* The driver/ represents a specific varient of OpenGL. Currently we have "gl"
representing OpenGL 1.4-2.1 (mostly fixed function) and "gles" representing
GLES 1.1 (fixed funciton) and 2.0 (fully shader based)
* Everything under cogl/ should fundamentally be supporting access to the
GPU. Essentially Cogl's most basic requirement is to provide a nice GPU
Graphics API and drawing a line between this and the utility functionality
we add to support Clutter should help keep this lean and maintainable.
* Code under utils/ as suggested builds on cogl/ adding more convenient
APIs or mechanism to optimize special cases. Broadly speaking you can
compare cogl/ to OpenGL and utils/ to GLU.
* clutter/pango will be moved to clutter/cogl/pango
How some of the internal configure.ac/pkg-config terminology has changed:
backendextra -> CLUTTER_WINSYS_BASE # e.g. "x11"
backendextralib -> CLUTTER_WINSYS_BASE_LIB # e.g. "x11/libclutter-x11.la"
clutterbackend -> {CLUTTER,COGL}_WINSYS # e.g. "glx"
CLUTTER_FLAVOUR -> {CLUTTER,COGL}_WINSYS
clutterbackendlib -> CLUTTER_WINSYS_LIB
CLUTTER_COGL -> COGL_DRIVER # e.g. "gl"
Note: The CLUTTER_FLAVOUR and CLUTTER_COGL defines are kept for apps
As the first thing to take advantage of the new winsys component in Cogl;
cogl_get_proc_address() has been moved from cogl/{gl,gles}/cogl.c into
cogl/common/cogl.c and this common implementation first trys
_cogl_winsys_get_proc_address() but if that fails then it falls back to
gmodule.
169 lines
5.8 KiB
C
169 lines
5.8 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2008,2009 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:
|
|
* Robert Bragg <robert@linux.intel.com>
|
|
*/
|
|
|
|
#ifndef __COGL_VERTEX_BUFFER_H
|
|
#define __COGL_VERTEX_BUFFER_H
|
|
|
|
#include "cogl-handle.h"
|
|
|
|
#include <glib.h>
|
|
|
|
/* Note we put quite a bit into the flags here to help keep
|
|
* the down size of the CoglVertexBufferAttrib struct below. */
|
|
typedef enum _CoglVertexBufferAttribFlags
|
|
{
|
|
/* Types */
|
|
/* NB: update the _TYPE_MASK below if these are changed */
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_COLOR_ARRAY = 1<<0,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_NORMAL_ARRAY = 1<<1,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_TEXTURE_COORD_ARRAY = 1<<2,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_VERTEX_ARRAY = 1<<3,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_CUSTOM_ARRAY = 1<<4,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_INVALID = 1<<5,
|
|
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_NORMALIZED = 1<<6,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_ENABLED = 1<<7,
|
|
|
|
/* Usage hints */
|
|
/* FIXME - flatten into one flag, since its used as a boolean */
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_INFREQUENT_RESUBMIT = 1<<8,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_FREQUENT_RESUBMIT = 1<<9,
|
|
|
|
/* GL Data types */
|
|
/* NB: Update the _GL_TYPE_MASK below if these are changed */
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_BYTE = 1<<10,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_UNSIGNED_BYTE = 1<<11,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_SHORT = 1<<12,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_UNSIGNED_SHORT = 1<<13,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_INT = 1<<14,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_UNSIGNED_INT = 1<<15,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_FLOAT = 1<<16,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_DOUBLE = 1<<17,
|
|
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_SUBMITTED = 1<<18,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_UNUSED = 1<<19
|
|
|
|
/* XXX NB: If we need > 24 bits then look at changing the layout
|
|
* of struct _CoglVertexBufferAttrib below */
|
|
} CoglVertexBufferAttribFlags;
|
|
|
|
#define COGL_VERTEX_BUFFER_ATTRIB_FLAG_TYPE_MASK \
|
|
(COGL_VERTEX_BUFFER_ATTRIB_FLAG_COLOR_ARRAY \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_NORMAL_ARRAY \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_TEXTURE_COORD_ARRAY \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_VERTEX_ARRAY \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_CUSTOM_ARRAY \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_INVALID)
|
|
|
|
#define COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_MASK \
|
|
(COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_BYTE \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_UNSIGNED_BYTE \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_SHORT \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_UNSIGNED_SHORT \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_INT \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_UNSIGNED_INT \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_FLOAT \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_DOUBLE)
|
|
|
|
|
|
typedef struct _CoglVertexBufferAttrib
|
|
{
|
|
/* TODO: look at breaking up the flags into seperate
|
|
* bitfields and seperate enums */
|
|
CoglVertexBufferAttribFlags flags:24;
|
|
guint8 id;
|
|
GQuark name;
|
|
union _u
|
|
{
|
|
const void *pointer;
|
|
size_t vbo_offset;
|
|
} u;
|
|
size_t span_bytes;
|
|
guint16 stride;
|
|
guint8 n_components;
|
|
guint8 texture_unit;
|
|
|
|
} CoglVertexBufferAttrib;
|
|
|
|
typedef enum _CoglVertexBufferVBOFlags
|
|
{
|
|
COGL_VERTEX_BUFFER_VBO_FLAG_UNSTRIDED = 1<<0,
|
|
COGL_VERTEX_BUFFER_VBO_FLAG_STRIDED = 1<<1,
|
|
COGL_VERTEX_BUFFER_VBO_FLAG_MULTIPACK = 1<<2,
|
|
|
|
/* FIXME - flatten into one flag, since its used as a boolean */
|
|
COGL_VERTEX_BUFFER_VBO_FLAG_INFREQUENT_RESUBMIT = 1<<3,
|
|
COGL_VERTEX_BUFFER_VBO_FLAG_FREQUENT_RESUBMIT = 1<<4,
|
|
|
|
COGL_VERTEX_BUFFER_VBO_FLAG_SUBMITTED = 1<<5
|
|
} CoglVertexBufferVBOFlags;
|
|
|
|
/*
|
|
* A CoglVertexBufferVBO represents one or more attributes in a single
|
|
* buffer object
|
|
*/
|
|
typedef struct _CoglVertexBufferVBO
|
|
{
|
|
CoglVertexBufferVBOFlags flags;
|
|
|
|
/* Note: this is a pointer to handle fallbacks. It normally holds
|
|
* a GLuint VBO name, but when the driver doesn't support VBOs then
|
|
* this simply points to an malloc'd buffer. */
|
|
void *vbo_name; /*!< The name of the corresponding buffer object */
|
|
size_t vbo_bytes; /*!< The lengh of the allocated buffer object in bytes */
|
|
GList *attributes;
|
|
} CoglVertexBufferVBO;
|
|
|
|
typedef struct _CoglVertexBufferIndices
|
|
{
|
|
CoglHandleObject _parent;
|
|
|
|
/* Note: this is a pointer to handle fallbacks. It normally holds
|
|
* a GLuint VBO name, but when the driver doesn't support VBOs then
|
|
* this simply points to an malloc'd buffer. */
|
|
void *vbo_name;
|
|
GLenum type;
|
|
} CoglVertexBufferIndices;
|
|
|
|
typedef struct _CoglVertexBuffer
|
|
{
|
|
CoglHandleObject _parent;
|
|
|
|
int n_vertices; /*!< The number of vertices in the buffer */
|
|
GList *submitted_vbos; /* The VBOs currently submitted to the GPU */
|
|
|
|
/* Note: new_attributes is normally NULL and only valid while
|
|
* modifying a buffer. */
|
|
GList *new_attributes; /*!< attributes pending submission */
|
|
|
|
} CoglVertexBuffer;
|
|
|
|
CoglVertexBuffer *_cogl_vertex_buffer_pointer_from_handle (CoglHandle handle);
|
|
CoglVertexBufferIndices *
|
|
_cogl_vertex_buffer_indices_pointer_from_handle (CoglHandle handle);
|
|
|
|
#endif /* __COGL_VERTEX_BUFFER_H */
|
|
|