mirror of
https://github.com/brl/mutter.git
synced 2024-11-23 08:30:42 -05:00
323eaf3fb3
Conflicts:
clutter/cogl/gl/cogl-texture.c
clutter/cogl/gles/cogl-primitives.c
* cogl-material:
clutter-{clone-,}texture weren't updating their material opacity.
Updates GLES1 support for CoglMaterial
Normalizes gl vs gles code in preperation for synching material changes
Removes cogl_blend_func and cogl_alpha_func
Fully integrates CoglMaterial throughout the rest of Cogl
[cogl-material] Restore the GL_TEXTURE_ENV_MODE after material_rectangle
[cogl-material] Make the user_tex_coords parameter of _rectangle const
[test-cogl-material] Remove return value from material_rectangle_paint
Add cogl-material.h and cogl-matrix.h to libclutterinclude_HEADERS
[cogl-material] improvements for cogl_material_rectangle
[cogl-material] Adds a cogl_material_set_color function
[cogl-material] Some improvements for how we sync CoglMaterial state with OpenGL
[cogl-material] Converts clutter-texture/clutter-clone-texture to the material API
[doc] Hooks up cogl-material reference documentation
Updates previous GLES multi-texturing code to use CoglMaterial
Adds a CoglMaterial abstraction, which includes support for multi-texturing
[doc] Hooks up cogl-matrix reference documentation
Adds CoglMatrix utility code
[tests] Adds an interactive unit test for multi-texturing
[multi-texturing] This adds a new cogl_multi_texture API for GL,GLES1 + GLES2
38 lines
914 B
Makefile
38 lines
914 B
Makefile
INCLUDES = \
|
|
-I$(top_srcdir) \
|
|
-I$(top_srcdir)/clutter \
|
|
-I$(top_srcdir)/clutter/cogl \
|
|
-I$(top_srcdir)/clutter/cogl/$(CLUTTER_COGL) \
|
|
-I$(top_builddir)/clutter \
|
|
-I$(top_builddir)/clutter/cogl \
|
|
-DG_LOG_DOMAIN=\"Cogl-Common\" \
|
|
-DCLUTTER_COMPILATION \
|
|
$(CLUTTER_CFLAGS) \
|
|
$(CLUTTER_DEBUG_CFLAGS) \
|
|
$(MAINTAINER_CFLAGS) \
|
|
$(GCC_FLAGS)
|
|
|
|
LDADD = $(CLUTTER_LIBS)
|
|
|
|
noinst_LTLIBRARIES = libclutter-cogl-common.la
|
|
EXTRA_DIST = stb_image.c
|
|
|
|
libclutter_cogl_common_la_SOURCES = \
|
|
cogl-handle.h \
|
|
cogl-util.h \
|
|
cogl-util.c \
|
|
cogl-bitmap.h \
|
|
cogl-bitmap.c \
|
|
cogl-bitmap-fallback.c \
|
|
cogl-primitives.h \
|
|
cogl-primitives.c \
|
|
cogl-bitmap-pixbuf.c \
|
|
cogl-clip-stack.h \
|
|
cogl-clip-stack.c \
|
|
cogl-fixed.c \
|
|
cogl-color.c \
|
|
cogl-vertex-buffer-private.h \
|
|
cogl-vertex-buffer.c \
|
|
cogl-matrix.c \
|
|
cogl-material.c
|