Google Git
Sign in
android / platform / frameworks / rs / 61db21cef81cbc8439b34a8f1d32952339ffc190
commit61db21cef81cbc8439b34a8f1d32952339ffc190[log] [tgz]
authorStephen Hines <[email protected]>Thu Aug 21 23:27:46 2014 -0700
committerStephen Hines <[email protected]>Thu Aug 21 23:27:46 2014 -0700
tree62a54045fbfe51a5ebb65c0ae6e7c67fa1037549
parent4c513c12f0f620c336efce7b92b8f26aae39ffdd [diff]
parent81cfa2c51d4e8316f9e3519917b7dae7ceeb500d [diff]
resolved conflicts for merge of 81cfa2c5 to lmp-dev-plus-aosp

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