Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / frameworks / rs / 5cb36d9b36617f6b0493602ef61d620dc8f7e0ae
commit5cb36d9b36617f6b0493602ef61d620dc8f7e0ae[log] [tgz]
authorJason Sams <jsams@google.com>Thu Aug 08 17:49:56 2013 -0700
committerJason Sams <jsams@google.com>Thu Aug 08 17:49:56 2013 -0700
tree705918914816129a6608e28c1c96ee94e248107d
parent32d93696ac61c7ca9f63756879dcd07a7f4165bd [diff]
parentb10a68c39dfa88face28995ec29942827f6a49bd [diff]
Merge commit 'b10a68c3' into manualmerge

Conflicts:
	cpu_ref/rsCpuIntrinsicColorMatrix.cpp

Change-Id: Ibc2f1514f8858d99f08380f698bc9ae533c69212
tree: 705918914816129a6608e28c1c96ee94e248107d
  1. cpp/
  2. cpu_ref/
  3. driver/
  4. java/
  5. scriptc/
  6. server/
  7. tests/
  8. Android.mk
  9. CleanSpec.mk
  10. rs.h
  11. rs.spec
  12. rs_hal.h
  13. rs_native.spec
  14. rsAdapter.cpp
  15. rsAdapter.h
  16. rsAllocation.cpp
  17. rsAllocation.h
  18. rsAnimation.cpp
  19. rsAnimation.h
  20. rsComponent.cpp
  21. rsComponent.h
  22. rsContext.cpp
  23. rsContext.h
  24. rsCppUtils.cpp
  25. rsCppUtils.h
  26. rsDebugHelper.h
  27. rsDefines.h
  28. rsDevice.cpp
  29. rsDevice.h
  30. rsElement.cpp
  31. rsElement.h
  32. rsEnv.h
  33. rsFBOCache.cpp
  34. rsFBOCache.h
  35. rsFifo.h
  36. rsFifoSocket.cpp
  37. rsFifoSocket.h
  38. rsFileA3D.cpp
  39. rsFileA3D.h
  40. rsFont.cpp
  41. rsFont.h
  42. rsg.spec
  43. rsg_generator.c
  44. rsgApi.cpp.rsg
  45. rsgApiFuncDecl.h.rsg
  46. rsgApiReplay.cpp.rsg
  47. rsgApiStructs.h.rsg
  48. rsGrallocConsumer.cpp
  49. rsGrallocConsumer.h
  50. rsMatrix2x2.cpp
  51. rsMatrix2x2.h
  52. rsMatrix3x3.cpp
  53. rsMatrix3x3.h
  54. rsMatrix4x4.cpp
  55. rsMatrix4x4.h
  56. rsMesh.cpp
  57. rsMesh.h
  58. rsMutex.cpp
  59. rsMutex.h
  60. rsObjectBase.cpp
  61. rsObjectBase.h
  62. rsPath.cpp
  63. rsPath.h
  64. rsProgram.cpp
  65. rsProgram.h
  66. rsProgramBase.h
  67. rsProgramFragment.cpp
  68. rsProgramFragment.h
  69. rsProgramRaster.cpp
  70. rsProgramRaster.h
  71. rsProgramStore.cpp
  72. rsProgramStore.h
  73. rsProgramVertex.cpp
  74. rsProgramVertex.h
  75. rsRuntime.h
  76. rsSampler.cpp
  77. rsSampler.h
  78. rsScript.cpp
  79. rsScript.h
  80. rsScriptC.cpp
  81. rsScriptC.h
  82. rsScriptC_Lib.cpp
  83. rsScriptC_LibGL.cpp
  84. rsScriptGroup.cpp
  85. rsScriptGroup.h
  86. rsScriptIntrinsic.cpp
  87. rsScriptIntrinsic.h
  88. rsSignal.cpp
  89. rsSignal.h
  90. rsStream.cpp
  91. rsStream.h
  92. rsThreadIO.cpp
  93. rsThreadIO.h
  94. rsType.cpp
  95. rsType.h
  96. rsUtils.h
  97. spec.h
  98. spec.l