af0cb47570
Bug 1049 - Clutter doesn't support most GLSL uniforms (patch by Chris Lord and Neil Roberts) * README: Update release notes. * clutter/Makefile.am: * clutter/clutter-shader-types.[ch]: Add GValue types for shader values. * clutter/clutter-actor.[ch]: Update the shader API to use the newly added GValue support for GLSL shader uniform setters. * clutter/clutter-shader.[ch]: Add float and integer convenience API for single value GLSL uniform setters. * clutter/cogl/cogl-shader.h: Add new uniform setters. * clutter/cogl/gl/cogl-context.c: * clutter/cogl/gl/cogl-context.h: * clutter/cogl/gl/cogl-defines.h.in: * clutter/cogl/gl/cogl-program.c: * clutter/cogl/gl/cogl.c: Update the GL implementation of COGL to handle the GLSL uniform setters. * clutter/cogl/gles/cogl-gles2-wrapper.c: * clutter/cogl/gles/cogl-gles2-wrapper.h: * clutter/cogl/gles/cogl-internal.h: * clutter/cogl/gles/cogl-program.c: Update the GLES 2.0 implementation of COGL to handle the GLSL uniform setters. * doc/reference/clutter/clutter-sections.txt: * doc/reference/cogl/cogl-sections.txt: Update the documentation. * tests/interactive/test-fbo.c: * tests/interactive/test-shader.c: Update the shader tests.
99 lines
2.5 KiB
C
99 lines
2.5 KiB
C
/*
|
|
* Clutter COGL
|
|
*
|
|
* A basic GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Authored By Matthew Allum <mallum@openedhand.com>
|
|
*
|
|
* Copyright (C) 2007 OpenedHand
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef __COGL_INTERNAL_H
|
|
#define __COGL_INTERNAL_H
|
|
|
|
typedef enum {
|
|
COGL_BOXED_NONE,
|
|
COGL_BOXED_INT,
|
|
COGL_BOXED_FLOAT,
|
|
COGL_BOXED_MATRIX
|
|
} CoglBoxedType;
|
|
|
|
typedef struct _CoglBoxedValue
|
|
{
|
|
CoglBoxedType type;
|
|
int size, count;
|
|
gboolean transpose;
|
|
|
|
union {
|
|
gfloat float_value[4];
|
|
gint int_value[4];
|
|
gfloat matrix[16];
|
|
gfloat *float_array;
|
|
gint *int_array;
|
|
gpointer array;
|
|
} v;
|
|
} CoglBoxedValue;
|
|
|
|
|
|
#define COGL_DEBUG 0
|
|
|
|
#if COGL_DEBUG
|
|
|
|
#include <stdio.h>
|
|
|
|
const char *_cogl_error_string(GLenum errorCode);
|
|
|
|
#define GE(x...) G_STMT_START { \
|
|
GLenum err; \
|
|
(x); \
|
|
while ((err = glGetError()) != GL_NO_ERROR) { \
|
|
fprintf(stderr, "glError: %s caught at %s:%u\n", \
|
|
(char *)_cogl_error_string(err), \
|
|
__FILE__, __LINE__); \
|
|
} \
|
|
} G_STMT_END
|
|
|
|
#else /* COGL_DEBUG */
|
|
|
|
#define GE(x) (x);
|
|
|
|
#endif /* COGL_DEBUG */
|
|
|
|
#define COGL_ENABLE_BLEND (1<<1)
|
|
#define COGL_ENABLE_TEXTURE_2D (1<<2)
|
|
#define COGL_ENABLE_ALPHA_TEST (1<<3)
|
|
#define COGL_ENABLE_TEXTURE_RECT (1<<4)
|
|
#define COGL_ENABLE_VERTEX_ARRAY (1<<5)
|
|
#define COGL_ENABLE_TEXCOORD_ARRAY (1<<6)
|
|
#define COGL_ENABLE_COLOR_ARRAY (1<<7)
|
|
#define COGL_ENABLE_BACKFACE_CULLING (1<<8)
|
|
|
|
gint
|
|
_cogl_get_format_bpp (CoglPixelFormat format);
|
|
|
|
void
|
|
cogl_enable (gulong flags);
|
|
|
|
gulong
|
|
cogl_get_enable ();
|
|
|
|
void
|
|
cogl_blend_func (COGLenum src_factor,
|
|
COGLenum dst_factor);
|
|
|
|
#endif /* __COGL_INTERNAL_H */
|