mirror of
https://github.com/brl/mutter.git
synced 2024-11-23 16:40:41 -05:00
42ed195f01
now stored in a separate struct so they can be stored for
application program objects as well.
* clutter/cogl/gles/cogl.c: Moved stub shader functions into
separate files.
(_cogl_features_init): Report support for the shaders feature on
GLES 2
* clutter/cogl/gles/cogl-shader.h:
* clutter/cogl/gles/cogl-shader.c:
* clutter/cogl/gles/cogl-program.h:
* clutter/cogl/gles/cogl-program.c: Separate files to handle
shaders on programs on GLES. If version 1.1 is being used then the
stub functions which all fail are still used.
* clutter/cogl/gles/cogl-gles2-wrapper.c
(cogl_gles2_wrapper_init, cogl_gles2_wrapper_bind_attributes),
(cogl_gles2_wrapper_get_uniforms): Move the uniforms and attribute
bindings into a separate function so they can be used to bind on
application shaders as well.
(cogl_gles2_wrapper_update_matrix): Now takes a parameter and is
no longer static so that it can be used to update all of the
matrices when a new shader is bound.
* clutter/cogl/gles/cogl-defines.h.in: Use GL_COMPILE_STATUS for
CGL_OBJECT_COMPILE_STATUS if the latter isn't available (for
example on GLES 2).
* clutter/cogl/gles/cogl-context.h (CoglContext): Added handle
arrays for programs and shaders.
* clutter/cogl/gles/cogl-context.c (cogl_create_context)
(cogl_destroy_context): Initialize and destroy program and shader
handle array.
* clutter/cogl/gles/Makefile.am (libclutter_cogl_la_SOURCES): Add
cogl-{shader,program}.{c,h}
62 lines
1.5 KiB
Makefile
62 lines
1.5 KiB
Makefile
libclutterincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/cogl
|
|
libclutterinclude_HEADERS = $(top_builddir)/clutter/cogl/cogl.h \
|
|
$(top_builddir)/clutter/cogl/cogl-defines-gles.h
|
|
|
|
INCLUDES = \
|
|
-I$(top_srcdir) \
|
|
-I$(top_srcdir)/clutter \
|
|
-I$(top_srcdir)/clutter/cogl \
|
|
-I$(top_srcdir)/clutter/cogl/common \
|
|
-I$(top_srcdir)/clutter/cogl/$(CLUTTER_COGL) \
|
|
-I$(top_builddir)/clutter \
|
|
-I$(top_builddir)/clutter/cogl \
|
|
$(CLUTTER_CFLAGS) \
|
|
$(CLUTTER_DEBUG_CFLAGS) \
|
|
$(GCC_FLAGS)
|
|
|
|
LDADD = $(CLUTTER_LIBS)
|
|
|
|
noinst_LTLIBRARIES = libclutter-cogl.la
|
|
|
|
libclutter_cogl_la_SOURCES = \
|
|
$(top_builddir)/clutter/cogl/cogl.h \
|
|
$(top_builddir)/clutter/cogl/cogl-defines-gles.h \
|
|
cogl-internal.h \
|
|
cogl-texture.h \
|
|
cogl-fbo.h \
|
|
cogl-context.h \
|
|
cogl.c \
|
|
cogl-primitives.c \
|
|
cogl-texture.c \
|
|
cogl-fbo.c \
|
|
cogl-context.c \
|
|
cogl-gles2-wrapper.h \
|
|
cogl-program.h \
|
|
cogl-program.c \
|
|
cogl-shader.h \
|
|
cogl-shader.c
|
|
|
|
if USE_GLES2_WRAPPER
|
|
libclutter_cogl_la_SOURCES += \
|
|
cogl-gles2-wrapper.c \
|
|
cogl-fixed-vertex-shader.h \
|
|
cogl-fixed-vertex-shader.c \
|
|
cogl-fixed-fragment-shader.h \
|
|
cogl-fixed-fragment-shader.c
|
|
endif
|
|
|
|
EXTRA_DIST = cogl-defines.h.in \
|
|
stringify.sh \
|
|
cogl-fixed-vertex-shader.glsl \
|
|
cogl-fixed-fragment-shader.glsl
|
|
|
|
libclutter_cogl_la_LIBADD = $(top_builddir)/clutter/cogl/common/libclutter-cogl-common.la
|
|
|
|
.glsl.h :
|
|
/bin/sh $(top_srcdir)/clutter/cogl/gles/stringify.sh -h $<
|
|
|
|
.glsl.c :
|
|
/bin/sh $(top_srcdir)/clutter/cogl/gles/stringify.sh $<
|
|
|
|
cogl-gles2-wrapper.lo : cogl-fixed-vertex-shader.h cogl-fixed-fragment-shader.h
|