Google Git
Sign in
android / platform / frameworks / rs / 3dd429cc32388ca0c3d7a9368ed2e348b8fdaab1
commit3dd429cc32388ca0c3d7a9368ed2e348b8fdaab1[log] [tgz]
authorJason Sams <[email protected]>Tue Nov 17 18:07:54 2009 -0800
committerJason Sams <[email protected]>Tue Nov 17 18:07:54 2009 -0800
treeebcbbfc0531e5ff2875ca66711171f5dfe9fc46a
parent94743c90e24abaddfdf66446f031e2b0f41a3c7c [diff]
parent9e19b58908e942d4b932f8abbc5e27b4ac6a03c7 [diff]
resolved conflicts for merge of f6309041 to master
tree: ebcbbfc0531e5ff2875ca66711171f5dfe9fc46a
  1. java/
  2. Android.mk
  3. RenderScript.h
  4. RenderScriptEnv.h
  5. rs.spec
  6. rsAdapter.cpp
  7. rsAdapter.h
  8. rsAllocation.cpp
  9. rsAllocation.h
  10. rsComponent.cpp
  11. rsComponent.h
  12. rsContext.cpp
  13. rsContext.h
  14. rsDevice.cpp
  15. rsDevice.h
  16. rsElement.cpp
  17. rsElement.h
  18. rsFileA3D.cpp
  19. rsFileA3D.h
  20. rsFileA3DDecls.h
  21. rsg_generator.c
  22. rsgApi.cpp.rsg
  23. rsgApiFuncDecl.h.rsg
  24. rsgApiReplay.cpp.rsg
  25. rsgApiStructs.h.rsg
  26. rsHandcode.h
  27. rsLight.cpp
  28. rsLight.h
  29. rsLocklessFifo.cpp
  30. rsLocklessFifo.h
  31. rsMatrix.cpp
  32. rsMatrix.h
  33. rsMesh.cpp
  34. rsMesh.h
  35. rsNoise.cpp
  36. rsNoise.h
  37. rsObjectBase.cpp
  38. rsObjectBase.h
  39. rsProgram.cpp
  40. rsProgram.h
  41. rsProgramFragment.cpp
  42. rsProgramFragment.h
  43. rsProgramFragmentStore.cpp
  44. rsProgramFragmentStore.h
  45. rsProgramRaster.cpp
  46. rsProgramRaster.h
  47. rsProgramVertex.cpp
  48. rsProgramVertex.h
  49. rsSampler.cpp
  50. rsSampler.h
  51. rsScript.cpp
  52. rsScript.h
  53. rsScriptC.cpp
  54. rsScriptC.h
  55. rsScriptC_Lib.cpp
  56. rsSimpleMesh.cpp
  57. rsSimpleMesh.h
  58. rsThreadIO.cpp
  59. rsThreadIO.h
  60. rsType.cpp
  61. rsType.h
  62. rsUtils.h
  63. spec.h
  64. spec.l