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.
97 lines
3.5 KiB
C
97 lines
3.5 KiB
C
/*
|
|
* Clutter.
|
|
*
|
|
* An OpenGL based 'interactive canvas' library.
|
|
*
|
|
* Authored By Matthew Allum <mallum@openedhand.com>
|
|
*
|
|
* Copyright (C) 2008 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/>.
|
|
*/
|
|
|
|
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
|
|
#error "Only <clutter/clutter.h> can be included directly."
|
|
#endif
|
|
|
|
#ifndef __CLUTTER_SHADER_TYPES_H__
|
|
#define __CLUTTER_SHADER_TYPES_H__
|
|
|
|
#include <glib-object.h>
|
|
#include <cogl/cogl.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define CLUTTER_TYPE_SHADER_FLOAT (clutter_shader_float_get_type ())
|
|
#define CLUTTER_TYPE_SHADER_INT (clutter_shader_int_get_type ())
|
|
#define CLUTTER_TYPE_SHADER_MATRIX (clutter_shader_matrix_get_type ())
|
|
|
|
typedef struct _ClutterShaderFloat ClutterShaderFloat;
|
|
typedef struct _ClutterShaderInt ClutterShaderInt;
|
|
typedef struct _ClutterShaderMatrix ClutterShaderMatrix;
|
|
|
|
/**
|
|
* CLUTTER_VALUE_HOLDS_SHADER_FLOAT:
|
|
* @x: a #GValue
|
|
*
|
|
* Evaluates to %TRUE if @x holds a #ClutterShaderFloat.
|
|
*
|
|
* Since: 1.0
|
|
*/
|
|
#define CLUTTER_VALUE_HOLDS_SHADER_FLOAT(x) (G_VALUE_HOLDS ((x), CLUTTER_TYPE_SHADER_FLOAT))
|
|
|
|
/**
|
|
* CLUTTER_VALUE_HOLDS_SHADER_INT:
|
|
* @x: a #GValue
|
|
*
|
|
* Evaluates to %TRUE if @x holds a #ClutterShaderInt.
|
|
*
|
|
* Since: 1.0
|
|
*/
|
|
#define CLUTTER_VALUE_HOLDS_SHADER_INT(x) (G_VALUE_HOLDS ((x), CLUTTER_TYPE_SHADER_INT))
|
|
|
|
/**
|
|
* CLUTTER_VALUE_HOLDS_SHADER_MATRIX:
|
|
* @x: a #GValue
|
|
*
|
|
* Evaluates to %TRUE if @x holds a #ClutterShaderMatrix.
|
|
*
|
|
* Since: 1.0
|
|
*/
|
|
#define CLUTTER_VALUE_HOLDS_SHADER_MATRIX(x) (G_VALUE_HOLDS ((x), CLUTTER_TYPE_SHADER_MATRIX))
|
|
|
|
GType clutter_shader_float_get_type (void) G_GNUC_CONST;
|
|
GType clutter_shader_int_get_type (void) G_GNUC_CONST;
|
|
GType clutter_shader_matrix_get_type (void) G_GNUC_CONST;
|
|
|
|
void clutter_value_set_shader_float (GValue *value,
|
|
gint size,
|
|
const gfloat *floats);
|
|
void clutter_value_set_shader_int (GValue *value,
|
|
gint size,
|
|
const gint *ints);
|
|
void clutter_value_set_shader_matrix (GValue *value,
|
|
gint size,
|
|
const gfloat *matrix);
|
|
G_CONST_RETURN gfloat * clutter_value_get_shader_float (const GValue *value,
|
|
gsize *length);
|
|
G_CONST_RETURN COGLint *clutter_value_get_shader_int (const GValue *value,
|
|
gsize *length);
|
|
G_CONST_RETURN GLfloat *clutter_value_get_shader_matrix (const GValue *value,
|
|
gsize *length);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __CLUTTER_SHADER_TYPES_H__ */
|