Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / frameworks / rs / 03f1910431433f3a35f1445aa0bba2b00417f0cc
commit03f1910431433f3a35f1445aa0bba2b00417f0cc[log] [tgz]
authorSteve Block <steveblock@google.com>Mon Jan 09 23:24:46 2012 +0000
committerSteve Block <steveblock@google.com>Mon Jan 09 23:24:46 2012 +0000
tree3b74e3c04d9b15fad533b1e0eb380ddcdd93b181
parentc0a65425f8eb3573b1abd2a48292ca953c0a8590 [diff]
parentaf12ac6a08651464f8d823add667c706f993b587 [diff]
resolved conflicts for merge of 08289f55 to graphics-dev

Change-Id: I2c95cd461e364cbeae7ffbaea7ad5c87713d7df7
tree: 3b74e3c04d9b15fad533b1e0eb380ddcdd93b181
  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.cpp
  26. rsFifo.h
  27. rsFifoSocket.cpp
  28. rsFifoSocket.h
  29. rsFileA3D.cpp
  30. rsFileA3D.h
  31. rsFont.cpp
  32. rsFont.h
  33. rsg_generator.c
  34. rsgApi.cpp.rsg
  35. rsgApiFuncDecl.h.rsg
  36. rsgApiReplay.cpp.rsg
  37. rsgApiStructs.h.rsg
  38. rsLocklessFifo.cpp
  39. rsLocklessFifo.h
  40. rsMatrix2x2.cpp
  41. rsMatrix2x2.h
  42. rsMatrix3x3.cpp
  43. rsMatrix3x3.h
  44. rsMatrix4x4.cpp
  45. rsMatrix4x4.h
  46. rsMesh.cpp
  47. rsMesh.h
  48. rsMutex.cpp
  49. rsMutex.h
  50. rsObjectBase.cpp
  51. rsObjectBase.h
  52. rsPath.cpp
  53. rsPath.h
  54. rsProgram.cpp
  55. rsProgram.h
  56. rsProgramBase.h
  57. rsProgramFragment.cpp
  58. rsProgramFragment.h
  59. rsProgramRaster.cpp
  60. rsProgramRaster.h
  61. rsProgramStore.cpp
  62. rsProgramStore.h
  63. rsProgramVertex.cpp
  64. rsProgramVertex.h
  65. rsRuntime.h
  66. rsSampler.cpp
  67. rsSampler.h
  68. rsScript.cpp
  69. rsScript.h
  70. rsScriptC.cpp
  71. rsScriptC.h
  72. rsScriptC_Lib.cpp
  73. rsScriptC_LibGL.cpp
  74. rsSignal.cpp
  75. rsSignal.h
  76. rsStream.cpp
  77. rsStream.h
  78. rsThreadIO.cpp
  79. rsThreadIO.h
  80. rsType.cpp
  81. rsType.h
  82. rsUtils.h
  83. spec.h
  84. spec.l