diff options
| author | Bryce Harrington <b.harrington@samsung.com> | 2014-04-15 12:31:20 -0700 |
|---|---|---|
| committer | Bryce Harrington <b.harrington@samsung.com> | 2014-04-15 12:31:20 -0700 |
| commit | f618cb32fcca2ec91cadadcc2965cbe2602bc2cc (patch) | |
| tree | 2ca170d0fe7ba6a03627ba33b58ac3c98428c3fd | |
| parent | 9b8ab58b76af822e9ec5529b5ca982d960909d77 (diff) | |
cmake: Only use skia-sra API if ENABLE_LEGACY_SKIA_SRA specified
This enables us to move mainline to skia-samsung while (temporarily)
preserving backwards compatibility to the old skia-sra tree. This
option should be removed once we are no longer using skia-sra anywhere
and no longer need to test against it.
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | config.h.cmake | 1 | ||||
| -rw-r--r-- | src/skia-tests/mask.cpp | 6 |
3 files changed, 17 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5044703..ad4ff31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,7 @@ list(APPEND CASKBENCH_INCS option(ENABLE_GLX "Build against GLX for OpenGL" OFF) option(ENABLE_EGL "Build against EGL for OpenGL" ON) option(ENABLE_CAIROGLES "Use the cairogles fork API additions" OFF) +option(ENABLE_LEGACY_SKIA_SRA "Use the old version of skia-sra" OFF) # ---------------------------------------------------------------------- # Dependencies @@ -49,11 +50,17 @@ list(APPEND CASKBENCH_INCS_SYS ${CAIRO_INCLUDE_DIRS}) list(APPEND CASKBENCH_LIBS ${CAIRO_LIBRARIES}) check_include_files(cairo/cairo-gl.h HAVE_CAIRO_GL_H) +set(USE_LEGACY_SKIA_SRA 0) find_package(Skia REQUIRED) message("Skia found: ${SKIA_FOUND}") message("Using skia libraries at ${SKIA_LIBRARIES}") list(APPEND CASKBENCH_INCS ${SKIA_INCLUDE_DIRS}/) list(APPEND CASKBENCH_LIBS ${SKIA_LIBRARIES}) +if (ENABLE_LEGACY_SKIA_SRA) + # TODO: Hacky. Really, should autodetect skia api version. + # But this is just for temporary backwards compatibility. + set(USE_LEGACY_SKIA_SRA 1) +endif (ENABLE_LEGACY_SKIA_SRA) set(USE_GLX 0) if (ENABLE_GLX) @@ -178,12 +185,13 @@ message("PROJECT_VERSION: ${PROJECT_VERSION}") message("ARCHIVE_NAME: ${ARCHIVE_NAME}") # dependency info -message("GLX: ${ENABLE_GLX}") -message("EGL: ${ENABLE_EGL}") +message("GLX: ${ENABLE_GLX} -> ${USE_GLX}") +message("EGL: ${ENABLE_EGL} -> ${USE_EGL}") message("OPENGLES2: ${OPENGLES2_FOUND}") message("OPENGLES3: ${OPENGLES3_FOUND}") message("CAIROGLES: ${ENABLE_CAIROGLES}") message("CAIRO: ${CAIRO_INCLUDE_DIRS}") +message("SKIA-SRA (legacy): ${ENABLE_LEGACY_SKIA_SRA} -> ${USE_LEGACY_SKIA_SRA}") message("SKIA: ${SKIA_INCLUDE_DIRS}") message("------------------------------------------------------------------------") diff --git a/config.h.cmake b/config.h.cmake index bb6f3e1..edd66b7 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -8,6 +8,7 @@ #cmakedefine USE_EGL 1 #cmakedefine USE_GLX 0 #cmakedefine USE_CAIROGLES 0 +#cmakedefine USE_LEGACY_SKIA_SRA 1 #define PACKAGE "${PROJECT_NAME}" #define PACKAGE_NAME "${PROJECT_NAME}" diff --git a/src/skia-tests/mask.cpp b/src/skia-tests/mask.cpp index 2688d9d..fb1ef7b 100644 --- a/src/skia-tests/mask.cpp +++ b/src/skia-tests/mask.cpp @@ -1,3 +1,5 @@ +#include "config.h" + #include <SkCanvas.h> #include <SkPaint.h> #include <effects/SkStippleMaskFilter.h> @@ -8,7 +10,11 @@ int sk_setup_mask(caskbench_context_t *ctx) { +#if USE_LEGACY_SKIA_SRA SkMaskFilter *mask = new SkStippleMaskFilter(); +#else + SkMaskFilter *mask = SkStippleMaskFilter::Create(); +#endif ctx->skia_paint->setMaskFilter(mask); return 1; } |