mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 19:42:05 +00:00
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.
122 lines
5.0 KiB
C
122 lines
5.0 KiB
C
/*
|
|
* Clutter.
|
|
*
|
|
* An OpenGL based 'interactive canvas' library.
|
|
*
|
|
* Authored By Matthew Allum <mallum@openedhand.com>
|
|
* Øyvind Kolås <pippin@o-hand.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, 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_H__
|
|
#define __CLUTTER_SHADER_H__
|
|
|
|
#include <clutter/clutter-shader-types.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define CLUTTER_TYPE_SHADER (clutter_shader_get_type ())
|
|
#define CLUTTER_SHADER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CLUTTER_TYPE_SHADER, ClutterShader))
|
|
#define CLUTTER_SHADER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CLUTTER_TYPE_SHADER, ClutterShaderClass))
|
|
#define CLUTTER_IS_SHADER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CLUTTER_TYPE_SHADER))
|
|
#define CLUTTER_IS_SHADER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CLUTTER_TYPE_SHADER))
|
|
#define CLUTTER_SHADER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CLUTTER_TYPE_SHADER, ClutterShaderClass))
|
|
|
|
#define CLUTTER_SHADER_ERROR (clutter_shader_error_quark ())
|
|
|
|
/**
|
|
* ClutterShaderError:
|
|
* @CLUTTER_SHADER_ERROR_NO_ASM: No ASM shaders support
|
|
* @CLUTTER_SHADER_ERROR_NO_GLSL: No GLSL shaders support
|
|
* @CLUTTER_SHADER_ERROR_COMPILE: Compilation error
|
|
*
|
|
* #ClutterShader error enumeration
|
|
*
|
|
* Since: 0.6
|
|
*/
|
|
typedef enum {
|
|
CLUTTER_SHADER_ERROR_NO_ASM,
|
|
CLUTTER_SHADER_ERROR_NO_GLSL,
|
|
CLUTTER_SHADER_ERROR_COMPILE
|
|
} ClutterShaderError;
|
|
|
|
typedef struct _ClutterShader ClutterShader;
|
|
typedef struct _ClutterShaderPrivate ClutterShaderPrivate;
|
|
typedef struct _ClutterShaderClass ClutterShaderClass;
|
|
|
|
struct _ClutterShader
|
|
{
|
|
/*< private >*/
|
|
GObject parent;
|
|
ClutterShaderPrivate *priv;
|
|
};
|
|
|
|
struct _ClutterShaderClass
|
|
{
|
|
/*< private >*/
|
|
GObjectClass parent_class;
|
|
};
|
|
|
|
GQuark clutter_shader_error_quark (void);
|
|
GType clutter_shader_get_type (void) G_GNUC_CONST;
|
|
|
|
ClutterShader * clutter_shader_new (void);
|
|
|
|
void clutter_shader_set_is_enabled (ClutterShader *shader,
|
|
gboolean enabled);
|
|
gboolean clutter_shader_get_is_enabled (ClutterShader *shader);
|
|
|
|
gboolean clutter_shader_compile (ClutterShader *shader,
|
|
GError **error);
|
|
void clutter_shader_release (ClutterShader *shader);
|
|
gboolean clutter_shader_is_compiled (ClutterShader *shader);
|
|
|
|
void clutter_shader_set_vertex_source (ClutterShader *shader,
|
|
const gchar *data,
|
|
gssize length);
|
|
void clutter_shader_set_fragment_source (ClutterShader *shader,
|
|
const gchar *data,
|
|
gssize length);
|
|
|
|
G_CONST_RETURN gchar *clutter_shader_get_vertex_source (ClutterShader *shader);
|
|
G_CONST_RETURN gchar *clutter_shader_get_fragment_source (ClutterShader *shader);
|
|
|
|
void clutter_shader_set_uniform (ClutterShader *shader,
|
|
const gchar *name,
|
|
const GValue *value);
|
|
|
|
CoglHandle clutter_shader_get_cogl_program (ClutterShader *shader);
|
|
CoglHandle clutter_shader_get_cogl_fragment_shader (ClutterShader *shader);
|
|
CoglHandle clutter_shader_get_cogl_vertex_shader (ClutterShader *shader);
|
|
|
|
#ifndef CLUTTER_DISABLE_DEPRECATED
|
|
void clutter_shader_set_uniform_1f (ClutterShader *shader,
|
|
const gchar *name,
|
|
gfloat value);
|
|
#endif
|
|
|
|
/* private */
|
|
void _clutter_shader_release_all (void);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __CLUTTER_SHADER_H__ */
|