Google Git
Sign in
android / platform / frameworks / rs / 7c4b1b3981d19b162d17a10045de12c35c089948
commit7c4b1b3981d19b162d17a10045de12c35c089948[log] [tgz]
authorJason Sams <[email protected]>Fri Feb 10 15:27:26 2012 -0800
committerJason Sams <[email protected]>Fri Feb 10 15:27:26 2012 -0800
tree7fe83749e9794b96fa152163d3a775da36748308
parent9bf3cf65ab8123c7c34df513abf96c84195e43b2 [diff]
parentaed4bec1efbab1ca56dabb5b97f66857eb153223 [diff]
resolved conflicts for merge of cb66aec0 to graphics-dev

Change-Id: Ic8817f702b6993f046c89f2fc598c9fe3bf30fe8
tree: 7fe83749e9794b96fa152163d3a775da36748308
  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