Chun-wei Fan
e0ad11a193
Revert "clutter-main.c: Fix multiple declarations"
...
This reverts commit 3d74552684
.
This is a part to attempt to further investigate about the 0xC0000264 error
on Windows
2011-10-21 17:43:21 +08:00
Chun-wei Fan
098a83af9e
test-[interactive/conformance].bat: Update .exe name
2011-10-20 17:26:55 +08:00
Chun-wei Fan
a36ab5787b
Rename conform/interactive tests VS projects
...
Add a -clutter suffix for their project names to avoid clashes with the
COGL test executables
2011-10-20 16:35:38 +08:00
Chun-wei Fan
3d74552684
clutter-main.c: Fix multiple declarations
...
clutter_threads_impl_lock/clutter_threads_impl_unlock was accidently
defined 2 times during the revert-fix that.
2011-10-20 15:42:55 +08:00
Chun-wei Fan
d6af2e54c8
Merge branch 'master' into msvc-support-master
2011-10-20 15:41:46 +08:00
Chun-wei Fan
5419c11c99
Revert "Deprecate clutter_threads_init()"
...
This reverts commit 7e3a75c66b
.
Conflicts:
clutter/clutter-main.c
clutter/clutter-main.h
2011-10-20 15:17:25 +08:00
Kjartan Maraas
53a1d03179
Updated Norwegian bokmål translation
2011-10-19 23:18:16 +02:00
Emmanuele Bassi
f1d86071c3
build: Remove the GLES configuration option
...
The selector for GLES 1.1 or 2.0 is all in Cogl, now.
2011-10-19 15:32:41 +01:00
Robert Bragg
14b3ec8485
build: remove the experimental_image var from configure
...
Since the image backend is something now dealt with by Cogl there is no
need to check the experimental status of the backend in the Clutter
configure script.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
2011-10-19 15:27:20 +01:00
Robert Bragg
63cc5ab698
blur: don't accumulate texture padding twice
...
This removes the create_texture implementation for ClutterBlurEffect
because we already account for padding in the get_paint_volume
implementation so we were creating textures larger than necessary.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
2011-10-19 15:27:03 +01:00
Robert Bragg
2ba1a19870
build: Don't actually check for glx for glx flavour
...
GLX is now totally abstracted by Cogl so the "glx" flavour is actually
only used to determine the soname of clutter now so we don't actually
have to check for the glx header or that libGL provides any GLX symbols.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
2011-10-19 15:26:43 +01:00
Emmanuele Bassi
a18a8a3ae2
Avoid the shadowing of 'clone'
...
The clone() call can creep into the build environment, so it's a good
thing to avoid using 'clone' as a variable name.
2011-10-19 15:23:55 +01:00
Neil Roberts
b240b95a97
tests: Use the portable cogl wrappers for GLSL builtins
...
Instead of directly using the GLSL names for the builtins in the
shaders for test-shader and test-pick, this makes it use the Cogl
wrapper names instead. That way it will be portable to GLES2 as well.
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
2011-10-19 13:50:48 +01:00
Chun-wei Fan
e33a6219d8
Merge branch 'master' into msvc-support-master
2011-10-18 15:48:17 +08:00
Emmanuele Bassi
8083dd5178
docs: Improve documentation of LayoutManager
...
Especially with regards to layout properties and their usage inside a
ClutterScript UI definition.
2011-10-17 11:48:47 +01:00
Chun-wei Fan
8b5d255a2b
Update clutter.symbols
...
_clutter_shader_release_all is removed...
2011-10-17 18:37:32 +08:00
Emmanuele Bassi
3cc62523e6
docs: Clean up the 'running Clutter apps' chapter
2011-10-17 10:25:20 +01:00
Emmanuele Bassi
be4007ef53
Remove mentions of clutter_redraw()
2011-10-17 10:25:07 +01:00
Emmanuele Bassi
146e15297f
debug: Clean up debugging notes
2011-10-17 10:24:25 +01:00
Chun-wei Fan
3a95d81471
Update VS property sheets
...
Get rid of G_DISABLE_DEPRECATED-warnings are now used to tell people that
GLib-deprecated items is to be avoided
2011-10-17 15:57:19 +08:00
Chun-wei Fan
b1780711f7
Merge branch 'master' into msvc-support-master
2011-10-17 15:52:57 +08:00
Emmanuele Bassi
f75dfcfd8b
interactive: Use the newly added CLUTTER_ALIGN_BOTH value
...
We center a lot of stuff using ClutterAlignConstraints.
2011-10-15 18:36:27 +01:00
Emmanuele Bassi
1e51961f7a
align-constraint: Add CLUTTER_ALIGN_BOTH
...
Just like ClutterBindConstraint has two shorthand enumerations for binding
position and size and avoid using multiple instances, ClutterAlignConstraint
should have a way to align an actor with the same alignment factor on both
axis at the same time; this is especially useful for centering actors.
2011-10-15 18:36:27 +01:00
Fran Dieguez
30d309c6e3
Updaged Galician translations
2011-10-15 15:24:41 +02:00
Emmanuele Bassi
7f3363e1db
Tag all deprecated symbols using CLUTTER_DEPRECATED
...
This requires some minor surgery in the build to disable the deprecation
warnings in the deprecated classes.
2011-10-14 11:34:38 +01:00
Emmanuele Bassi
d93e6ef6b9
Bump up the dependency on gtk-doc
2011-10-14 11:34:26 +01:00
Emmanuele Bassi
a05eb9177d
build: Strip out G_DISABLE_DEPRECATED
...
We have compiler warnings, now.
2011-10-14 10:21:37 +01:00
Emmanuele Bassi
96cb1d7128
Disable deprecation warnings for the test suite
...
We test deprecated functionality as well as current one, so we need to
enable all symbols and disable the deprecation warnings.
2011-10-13 17:50:25 +01:00
Emmanuele Bassi
a063f09611
debug: Move paint-deform-tiles to CLUTTER_PAINT
...
The CLUTTER_DEBUG class of debugging flags is meant for debugging notes,
while the CLUTTER_PAINT debugging flags are for changing the output of
the paint cycle. Painting the DeformEffect tiles should go in the latter.
2011-10-13 11:38:27 +01:00
Emmanuele Bassi
ef1a3a5477
docs: Include test-threads.c in the API reference
...
We can use the test-threads.c interactive test as part of the documentation
on how to use threads with Clutter.
2011-10-13 10:42:30 +01:00
Emmanuele Bassi
c58baf42ca
interactive/threads: Clean up
...
Add some comments explaining why we use idle handlers to update the UI,
and update to the newest API in GLib master.
2011-10-13 10:38:36 +01:00
Piotr Drąg
e389240b23
Updated POTFILES.in
2011-10-12 20:33:16 +02:00
Emmanuele Bassi
e0283993f4
Avoid using deprecated API internally
...
Use the proper API to implement deprecated functions.
2011-10-12 16:44:55 +01:00
Emmanuele Bassi
72da6f808e
texture: Disable deprecation warnings
...
Sadly, ClutterTexture is still using internally deprecated API, like
clutter_actor_get_shader().
2011-10-12 12:36:41 +01:00
Chun-wei Fan
0ee89f1788
clutter-backend-win32.c: Include clutter-shader.h
...
This is needed for _clutter_shader_release_all to avoid C4013
errors/warnings (a.k.a implicit declaration of ...)
2011-10-12 17:50:32 +08:00
Emmanuele Bassi
53d9e88135
Remove _clutter_shader_release_all()
...
This function is called when the backend is being disposed - as a way
of releasing all ClutterShader. This doesn't take into account three
things:
- ClutterShader is deprecated
- the Backend is *never* disposed
- once the process terminates, all its resources are automatically
released by the OS
So the _clutter_shader_release_all() function is a pointless exercise
in futility.
2011-10-12 10:36:17 +01:00
Chun-wei Fan
a2bd2afb93
clutter/Makefile.am
...
The previous update on clutter-timeout-interval.[ch] is wrong, so correct
that and add $(deprecated_c_priv) to the VS sources list. Sorry.
2011-10-12 17:33:33 +08:00
Chun-wei Fan
15cafc4c77
clutter/Makefile.am: Update formatting from last commit
2011-10-12 17:30:08 +08:00
Chun-wei Fan
830d6887cd
clutter/Makefile.am: Made up for missed sources
...
The clutter/deprecated/clutter-timeout-interval.c is missed from the
deprecated_c sources list...
2011-10-12 17:26:31 +08:00
Chun-wei Fan
e0de326b2a
clutter/clutter-keysyms-table.c: Fix function name
...
The function name is clutter_unicode_to_keysym, not
clutter_unicode_to_keyval
2011-10-12 17:25:37 +08:00
Chun-wei Fan
cb98da4a9d
Update clutter.symbols
2011-10-12 17:24:36 +08:00
Chun-wei Fan
762a4350d1
Update VS support
...
-clutter/Makefile.am: Include the deprecated sources as well
-clutter.vc(x)projin: Add clutter/deprecated into the "Additional Include
Directories"
2011-10-12 17:02:08 +08:00
Emmanuele Bassi
9901a06a1f
tests: Fix some compiler warnings
2011-10-12 09:57:53 +01:00
Emmanuele Bassi
9e61cfcf38
tests: Disable deprecation warnings
2011-10-12 09:57:33 +01:00
Chun-wei Fan
f2dc315b3b
Fix VS 2008 property sheet
...
There was a quote escape problem... fix that. DOH!
2011-10-12 16:55:39 +08:00
Chun-wei Fan
97d51f201b
po/POTFILE.in: Reflect on the shift of sources
...
Several source files have been moved to clutter/deprecated, so reflect them
in the po/POTFILE.in file.
2011-10-12 16:51:58 +08:00
Chun-wei Fan
cbcd79d394
Update VS property sheets
...
For the following:
-Move of headers to $(srcroot)/clutter/deprecated, commits:
50cda9fe
4b748f43
4b33a9c5
e57f8c26
bcd7845d
62d72b86
a21f1d15
-Addition of clutter/clutter-enums.h, in commit d28e04be
.
-Addition of config file usage, in commit f5eee5ae
2011-10-12 16:25:28 +08:00
Chun-wei Fan
72bedbc4e9
Update clutter.symbols
...
For deprecation of APIs, in commits
522b8be3
(clutter_get_input_device_for_id())
6ef09dd1
(clutter_clear_glyph_cache())
01080dc5
(clutter_[sg]et_font_flags())
2011-10-12 16:17:27 +08:00
Chun-wei Fan
bd991e625b
Merge branch 'master' into msvc-support-master
2011-10-12 14:37:19 +08:00
Chun-wei Fan
9aabf1bca1
Update VS property sheets
...
Update to use COGL-1.0, not COGL-2.0.
2011-10-12 14:34:49 +08:00