Google Git
Sign in
android / platform / frameworks / rs / d3e4b744900ed6666f4dd3182ad5443be26c96dd
commitd3e4b744900ed6666f4dd3182ad5443be26c96dd[log] [tgz]
authorJason Sams <[email protected]>Tue Feb 07 16:40:51 2012 -0800
committerJason Sams <[email protected]>Tue Feb 07 16:40:51 2012 -0800
tree1cc74f17c92ba8f38f37cd920cbcca2740c58ca4
parent55b817ad2ea20e62936bbe1c96d693a4efc80d31 [diff]
parent5f27d6fb0b0b9184ba9820c629fc1354a635e515 [diff]
Merge commit 'bdeec118' into manualmerge

Conflicts:
	libs/rs/rsThreadIO.h

Change-Id: I7f448996a86f41188b47ec3dc353c364692e8bf2
tree: 1cc74f17c92ba8f38f37cd920cbcca2740c58ca4
  1. driver/
  2. scriptc/
  3. Android.mk
  4. RenderScript.h
  5. RenderScriptDefines.h
  6. RenderScriptEnv.h
  7. rs.spec
  8. rs_hal.h
  9. rsAdapter.cpp
  10. rsAdapter.h
  11. rsAllocation.cpp
  12. rsAllocation.h
  13. rsAnimation.cpp
  14. rsAnimation.h
  15. rsComponent.cpp
  16. rsComponent.h
  17. rsContext.cpp
  18. rsContext.h
  19. rsDevice.cpp
  20. rsDevice.h
  21. rsElement.cpp
  22. rsElement.h
  23. rsFBOCache.cpp
  24. rsFBOCache.h
  25. rsFifo.h
  26. rsFifoSocket.cpp
  27. rsFifoSocket.h
  28. rsFileA3D.cpp
  29. rsFileA3D.h
  30. rsFont.cpp
  31. rsFont.h
  32. rsg_generator.c
  33. rsgApi.cpp.rsg
  34. rsgApiFuncDecl.h.rsg
  35. rsgApiReplay.cpp.rsg
  36. rsgApiStructs.h.rsg
  37. rsMatrix2x2.cpp
  38. rsMatrix2x2.h
  39. rsMatrix3x3.cpp
  40. rsMatrix3x3.h
  41. rsMatrix4x4.cpp
  42. rsMatrix4x4.h
  43. rsMesh.cpp
  44. rsMesh.h
  45. rsMutex.cpp
  46. rsMutex.h
  47. rsObjectBase.cpp
  48. rsObjectBase.h
  49. rsPath.cpp
  50. rsPath.h
  51. rsProgram.cpp
  52. rsProgram.h
  53. rsProgramBase.h
  54. rsProgramFragment.cpp
  55. rsProgramFragment.h
  56. rsProgramRaster.cpp
  57. rsProgramRaster.h
  58. rsProgramStore.cpp
  59. rsProgramStore.h
  60. rsProgramVertex.cpp
  61. rsProgramVertex.h
  62. rsRuntime.h
  63. rsSampler.cpp
  64. rsSampler.h
  65. rsScript.cpp
  66. rsScript.h
  67. rsScriptC.cpp
  68. rsScriptC.h
  69. rsScriptC_Lib.cpp
  70. rsScriptC_LibGL.cpp
  71. rsSignal.cpp
  72. rsSignal.h
  73. rsStream.cpp
  74. rsStream.h
  75. rsThreadIO.cpp
  76. rsThreadIO.h
  77. rsType.cpp
  78. rsType.h
  79. rsUtils.h
  80. spec.h
  81. spec.l