Skip to content

GitLab

Switch branch/tag
  1. 30 May, 2014 2 commits
  3. 28 May, 2014 1 commit
  5. 27 May, 2014 1 commit
    • commit-bot@chromium.org's avatar
      Use SkAtomics_sync on Android · 64f6d154
      commit-bot@chromium.org authored 
      Every doc I've found about using Android's atomics says, "stop".

"* A handful of basic atomic operations.  The appropriate pthread
 * functions should be used instead of these whenever possible."

"... we recommend stopping from using these functions entirely. Very fortunately, GCC provides handy intrinsics functions that work with very reasonable performance and always provide a full barrier."

As far as I can tell, there's no code generation change here: both the __sync atomics and the android_ atomics use full memory barriers.  (And now with this all unified, it'll be easier to get the real wins by switching everything to __atomic atomics, which are like __sync atomics but allow control over memory barriers.)

BUG=skia:
R=bungeman@google.com, djsollen@google.com, mtklein@google.com, reed@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/305593002

git-svn-id: http://skia.googlecode.com/svn/trunk@14896 2bbb7eff-a529-9590-31e7-b0007b416f81
      64f6d154
  7. 20 May, 2014 5 commits
  9. 16 May, 2014 1 commit
    • commit-bot@chromium.org's avatar
      Generate bench/Android.mk from gyp. · 61744ec1
      commit-bot@chromium.org authored 
      For now, remove json functionality and do not depend on json. This
allows us to build and run until solving skbug.com/2448.

bench/DeferredSurfaceCopyBench.cpp:
Include GrRenderTarget last, so SK_SUPPORT_GPU will be set properly.

bench/ResultsWriter.h:
bench/benchmain.cpp:
Remove JSONResultsWriter when SK_BUILD_JSON_WRITER is not defined,
which is the case for the Android framework build.

gyp/bench.gyp:
Depend on skia and cutils (for android_atomic_inc etc).

gyp/common_conditions.gypi:
Define SK_BUILD_JSON_WRITER when skia_build_json_writer is set.

gyp/common_variables.gypi:
Add a flag for skia_build_json_writer, and set it only when
skia_android_framework is not set.

gyp/jsoncpp.gyp:
Do not build jsoncpp when skia_build_json_writer is not defined.
include/utils/SkJSONCPP.h:
Do not include json headers when SK_BUILD_JSON_WRITER is not defined.

platform_tools/android/bin/gyp_to_android.py:
Generate bench/Android.mk.

platform_tools/android/gyp_gen/gypd_parser.py:
Skip dest_dir when checking for include_dirs.

platform_tools/android/gyp_gen/makefile_writer.py:
Build bench/Android.mk when building external/skia.

platform_tools/android/gyp_gen/tool_makefile_writer.py:
Add a parameter for putting the binary into /data/local/tmp.

BUG=skia:2447
BUG=skia:2448
R=halcanary@google.com, reed@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/282053002

git-svn-id: http://skia.googlecode.com/svn/trunk@14760 2bbb7eff-a529-9590-31e7-b0007b416f81
      61744ec1
  11. 13 May, 2014 2 commits
  13. 08 May, 2014 1 commit
  15. 07 May, 2014 2 commits
  17. 01 May, 2014 3 commits
  19. 30 Apr, 2014 1 commit
  21. 28 Apr, 2014 1 commit
  23. 24 Apr, 2014 1 commit
  25. 22 Apr, 2014 1 commit
  27. 21 Apr, 2014 1 commit
  29. 18 Apr, 2014 1 commit
  31. 17 Apr, 2014 3 commits
  33. 16 Apr, 2014 2 commits
  35. 14 Apr, 2014 2 commits
  37. 11 Apr, 2014 3 commits
  39. 10 Apr, 2014 2 commits
  41. 09 Apr, 2014 1 commit
  43. 05 Apr, 2014 1 commit
    • commit-bot@chromium.org's avatar
      get iOS building again · ae0054e4
      commit-bot@chromium.org authored 
      1) Disable SampleApp.  Seems like it's totally horked?  SkOSFile_iOS.mm is missing about half the functions needed, and SkOSFile_stdio.cpp is double-providing the others.

2) Drop armv6.

3) Switch from putting headers in sources to putting the corresponding directories in includes.

4)  Force cast the type of glShaderSource.  Something to do with GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE?

After all this,
    env CC=clang CXX=clang++ GYP_DEFINES=skia_os=ios make
builds for me.
BUG=skia:2363
R=bsalomon@google.com, epoger@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/226413005

git-svn-id: http://skia.googlecode.com/svn/trunk@14069 2bbb7eff-a529-9590-31e7-b0007b416f81
      ae0054e4
  45. 04 Apr, 2014 2 commits