Permalink
Browse files

Porting to Karmic. This consists of:

1) Making use of version 1.0 of Clutter/PyClutter if present.

2) Porting to the 2.6 LLVM API.

3) Moving over to using <4 x float> LLVM vectors throughout. This means we can
   finally drop the 'disable-mmx' option which is no-longer supported in LLVM
   2.6.
  • Loading branch information...
1 parent 3d33464 commit 55d6b68427cf3d4224601cb46bdef96c27517453 @rjw57-demo rjw57-demo committed Oct 2, 2009
Showing with 942 additions and 490 deletions.
  1. +9 −4 bindings/python/CMakeLists.txt
  2. +14 −4 firtree/CMakeLists.txt
  3. +2 −1 firtree/engines/cpu/CMakeLists.txt
  4. +208 −214 firtree/engines/cpu/builtins.ll
  5. +23 −6 firtree/engines/cpu/clutter.hh
  6. +49 −7 firtree/engines/cpu/firtree-cpu-jit.cc
  7. +76 −75 firtree/engines/cpu/render-buffer.c
  8. +22 −6 firtree/firtree-buffer-sampler.cc
  9. +14 −8 firtree/firtree-cairo-surface-sampler.cc
  10. +10 −4 firtree/firtree-cogl-texture-sampler.cc
  11. +35 −26 firtree/firtree-engine.cc
  12. +24 −15 firtree/firtree-kernel.cc
  13. +17 −11 firtree/firtree-pixbuf-sampler.cc
  14. +72 −0 firtree/firtree.h.in
  15. +29 −0 firtree/internal/firtree-engine-intl.hh
  16. +1 −1 llvm-frontend/CMakeLists.txt
  17. +1 −1 llvm-frontend/llvm-emit-binop-arith.cc
  18. +1 −1 llvm-frontend/llvm-emit-binop-assign.cc
  19. +23 −6 llvm-frontend/llvm-emit-binop-cmp.cc
  20. +1 −1 llvm-frontend/llvm-emit-binop-logic.cc
  21. +84 −16 llvm-frontend/llvm-emit-constant.cc
  22. +3 −2 llvm-frontend/llvm-emit-constant.h
  23. +8 −4 llvm-frontend/llvm-emit-decl.cc
  24. +4 −3 llvm-frontend/llvm-emit-function-call.cc
  25. +8 −8 llvm-frontend/llvm-emit-loop.cc
  26. +12 −8 llvm-frontend/llvm-emit-negate.cc
  27. +2 −2 llvm-frontend/llvm-emit-return.cc
  28. +6 −6 llvm-frontend/llvm-emit-selection.cc
  29. +71 −6 llvm-frontend/llvm-emit-swizzle.cc
  30. +5 −5 llvm-frontend/llvm-emit-unary-incdec.cc
  31. +20 −8 llvm-frontend/llvm-frontend.cc
  32. +74 −21 llvm-frontend/llvm-private.h
  33. +9 −9 llvm-frontend/llvm-type-cast.cc
  34. +1 −0 testing/core/cpuengine.py
  35. +4 −1 tools/CMakeLists.txt
@@ -12,13 +12,18 @@ set(BUILD_PYTHON_BINDINGS 1)
if(NOT APPLE)
find_package(PkgConfig)
pkg_check_modules(CAIRO cairo)
- pkg_check_modules(CLUTTER clutter-0.8)
+ pkg_check_modules(CLUTTER clutter-1.0)
+ if(NOT CLUTTER_FOUND)
+ pkg_check_modules(CLUTTER clutter-0.8)
+ if(CLUTTER_FOUND)
+ pkg_check_modules(PYCLUTTER REQUIRED pyclutter-0.8)
+ endif(CLUTTER_FOUND)
+ else(NOT CLUTTER_FOUND)
+ pkg_check_modules(PYCLUTTER REQUIRED pyclutter-1.0)
+ endif(NOT CLUTTER_FOUND)
if(CAIRO_FOUND)
pkg_check_modules(PYCAIRO REQUIRED pycairo)
endif(CAIRO_FOUND)
- if(CLUTTER_FOUND)
- pkg_check_modules(PYCLUTTER REQUIRED pyclutter-0.8)
- endif(CLUTTER_FOUND)
endif(NOT APPLE)
if(NOT PYGOBJECT_FOUND)
@@ -4,9 +4,7 @@
#
# See LICENSE file for distribution rights.
-set(LLVM_CONFIG_COMPONENTS core
- codegen linker bitreader
- jit native)
+set(LLVM_CONFIG_COMPONENTS all)
find_package(LLVM)
find_package(PythonInterp)
@@ -22,7 +20,19 @@ include_directories(${LLVM_INCLUDE_DIRS})
if(NOT APPLE)
find_package(PkgConfig)
pkg_check_modules(CAIRO cairo)
- pkg_check_modules(CLUTTER clutter-0.8)
+ pkg_check_modules(CLUTTER clutter-1.0)
+ if(NOT CLUTTER_FOUND)
+ pkg_check_modules(CLUTTER clutter-0.8)
+ if(CLUTTER_FOUND)
+ set(CLUTTER_VERSION "0.8")
+ set(CLUTTER_VERSION_MAJOR "0")
+ set(CLUTTER_VERSION_MINOR "8")
+ endif(CLUTTER_FOUND)
+ else(NOT CLUTTER_FOUND)
+ set(CLUTTER_VERSION "1.0")
+ set(CLUTTER_VERSION_MAJOR "1")
+ set(CLUTTER_VERSION_MINOR "0")
+ endif(NOT CLUTTER_FOUND)
pkg_check_modules(GDK_PIXBUF gdk-pixbuf-2.0)
endif(NOT APPLE)
@@ -15,7 +15,7 @@ set(LLVM_CONFIG_COMPONENTS core
find_package(LLVM)
find_package(PythonInterp)
-find_program(LLVM_GCC_EXECUTABLE llvm-gcc)
+find_program(LLVM_GCC_EXECUTABLE llvm-gcc PATH /usr/lib/llvm/llvm/gcc-4.2/bin)
if(NOT LLVM_GCC_EXECUTABLE)
message(SEND_ERROR "llvm-gcc not found.")
@@ -40,6 +40,7 @@ add_custom_command(
-O3 builtins.nonopt.bc -f -o=builtins.bc
COMMAND ${LLVM_GCC_EXECUTABLE}
-fno-math-errno
+ -msse3 -march=i686 -O3
-o render-buffer.o
-c -emit-llvm
${GLIB_CFLAGS}
Oops, something went wrong.

0 comments on commit 55d6b68

Please sign in to comment.