[gegl/gsoc2009-gpu: 81/82] Merge branch 'master' into gsoc2009-gpu
- From: Øyvind Kolås <ok src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gegl/gsoc2009-gpu: 81/82] Merge branch 'master' into gsoc2009-gpu
- Date: Sun, 15 Nov 2009 01:54:49 +0000 (UTC)
commit 260c214a01f523cbb8e928f35249bb3f10595861
Merge: 57fd7c8... 7f05c58...
Author: �yvind Kolås <pippin gimp org>
Date: Sun Nov 15 01:39:51 2009 +0000
Merge branch 'master' into gsoc2009-gpu
Conflicts:
tests/.gitignore
.gitignore | 17 +-
AUTHORS | 4 +-
ChangeLog => ChangeLog.pre-0-1 | 644 +++++++++++++++++++-
HACKING | 21 +-
Makefile.am | 22 +
NEWS | 20 +-
autogen.sh | 29 +-
bin/.gitignore | 6 +-
bindings/gegl-sharp/.gitignore | 2 +
.../gegl-sharp/{ChangeLog => ChangeLog.pre-0-1} | 0
bindings/gegl-sharp/Makefile.am | 23 +
bindings/gegl-sharp/{configure.in => configure.ac} | 2 +-
bindings/gegl-sharp/gegl/Makefile.am | 6 +-
bindings/gegl-sharp/gegl/babl-api.xml | 13 +
bindings/gegl-sharp/gegl/custom/Node.custom | 4 +-
bindings/gegl-sharp/gegl/metadata | 3 +-
bindings/gegl-sharp/gegl/sources.in | 2 +
bindings/pygegl/autogen.sh | 3 +-
bindings/vala/autogen.sh | 2 +-
configure.ac | 14 +-
docs/Makefile.am | 29 +-
docs/development.txt | 2 +-
docs/gallery/Makefile.am | 4 +-
docs/gegl-sharp/index.html | 12 +-
docs/gegl-vala/index.html | 12 +-
docs/images/chain.png | Bin 3510 -> 0 bytes
docs/images/file.gif | Bin 452839 -> 0 bytes
docs/images/gegl-color-convert-op.gif | Bin 7057 -> 0 bytes
docs/images/gegl-color-model.gif | Bin 11916 -> 0 bytes
docs/images/gegl.jpg | Bin 7098 -> 0 bytes
docs/images/image_request.png | Bin 2976 -> 0 bytes
docs/images/image_to_image_manager_bridge.png | Bin 19400 -> 0 bytes
docs/images/request.png | Bin 2976 -> 0 bytes
docs/index-static.txt.in | 32 +-
docs/pygegl/index.html | 12 +-
docs/rgegl/index.html | 12 +-
examples/.gitignore | 18 +-
examples/gegl-paint.c | 28 +-
examples/util/gegl-view.c | 14 +-
gegl.doap | 18 +
gegl/Makefile.am | 2 +-
gegl/buffer/gegl-buffer-linear.c | 2 +-
gegl/buffer/gegl-buffer-private.h | 1 -
gegl/buffer/gegl-buffer.c | 5 +-
gegl/buffer/gegl-buffer.h | 9 +
gegl/buffer/gegl-tile-handler-cache.c | 118 +++--
gegl/gegl-init.c | 26 +-
gegl/gegl-plugin.h | 2 +
gegl/gegl-xml.c | 2 +-
gegl/graph/gegl-visitable.c | 4 -
gegl/operation/gegl-operation-context.c | 6 +-
gegl/operation/gegl-operation-filter.c | 40 ++-
gegl/operation/gegl-operation-point-composer.c | 92 +---
gegl/process/gegl-processor.c | 149 +++---
gegl/property-types/gegl-curve.c | 5 +-
operations/Makefile-common.am | 2 +-
operations/Makefile.am | 4 +-
operations/common/bilateral-filter.c | 41 +-
operations/common/box-blur.c | 72 ++-
operations/common/c2g.c | 44 +-
operations/common/gaussian-blur.c | 154 +++---
operations/common/normal.c | 186 ++++++
operations/common/opacity.c | 35 +-
operations/common/over.c | 184 ++++++
operations/common/snn-mean.c | 28 +-
operations/common/stress.c | 34 +-
operations/core/nop.c | 12 +-
operations/external/Makefile.am | 23 +-
operations/external/display.c | 6 +
operations/external/text.c | 2 +-
operations/generated/other-blend.rb | 12 +-
operations/workshop/Makefile.am | 2 +
operations/workshop/external/Makefile.am | 9 +-
operations/workshop/generated/Makefile.am | 2 +
operations/workshop/unpremul.c | 76 +++
tests/Makefile.am | 3 +-
tests/test-change-processor-rect.c | 155 +++++
tools/.gitignore | 8 +-
tools/Makefile.am | 5 +-
tools/gobj2dot.rb | 2 +-
80 files changed, 1999 insertions(+), 595 deletions(-)
---
diff --cc tests/Makefile.am
index 2920727,acc4dce..3b350e7
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -6,23 -6,10 +6,24 @@@ TESTS_ENVIRONMENT =
# The tests
TESTS = \
+ test-change-processor-rect \
test-proxynop-processing \
test-color-op \
- test-gegl-rectangle
+ test-gegl-rectangle \
+ test-gegl-gpu-texture-clear \
+ test-gegl-gpu-texture-clear-subrect \
+ test-gegl-gpu-texture-set \
+ test-gegl-gpu-texture-set-subrect \
+ test-gegl-gpu-texture-copy \
+ test-gegl-gpu-texture-copy-subrect \
+ test-gegl-gpu-texture-dup \
+ test-gegl-tile-lock-mode-write-then-read \
+ test-gegl-tile-lock-mode-write-then-gpu-read \
+ test-gegl-tile-lock-mode-gpu-write-then-read \
+ test-gegl-tile-lock-mode-gpu-write-then-gpu-read \
+ test-gegl-tile-cow \
+ test-gegl-tile-cow-consistency \
+ test-gegl-buffer-gpu-scale-normal
noinst_PROGRAMS = $(TESTS)
# Common CPPFLAGS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
