Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / frameworks / rs / 1c94845e04e974b22edf07d21ca03337bfb23b7c
commit1c94845e04e974b22edf07d21ca03337bfb23b7c[log] [tgz]
authorMathias Agopian <mathias@google.com>Thu Oct 21 13:48:42 2010 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>Thu Oct 21 13:48:42 2010 -0700
tree284d63aa839d9ae6699a9d9384f46744eedc46a4
parent98a128c83ea79099862e73d57f5790e45f63c6a0 [diff]
parentebd3188bde4e1bed569811631579bd94680d32a6 [diff]
am 4ceee5a6: (-s ours) am 73655bd2: Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread

Merge commit '4ceee5a6b0089ffbec75690b7284f80d481ab212'

* commit '4ceee5a6b0089ffbec75690b7284f80d481ab212':
  propagate RS context priority to EGLContext when possible. DO NOT MERGE.
tree: 284d63aa839d9ae6699a9d9384f46744eedc46a4
  1. java/
  2. scriptc/
  3. Android.mk
  4. RenderScript.h
  5. RenderScriptEnv.h
  6. rs.spec
  7. rsAdapter.cpp
  8. rsAdapter.h
  9. rsAllocation.cpp
  10. rsAllocation.h
  11. rsAnimation.cpp
  12. rsAnimation.h
  13. rsComponent.cpp
  14. rsComponent.h
  15. rsContext.cpp
  16. rsContext.h
  17. rsContextHostStub.h
  18. rsDevice.cpp
  19. rsDevice.h
  20. rsElement.cpp
  21. rsElement.h
  22. rsFileA3D.cpp
  23. rsFileA3D.h
  24. rsFont.cpp
  25. rsFont.h
  26. rsg_generator.c
  27. rsg_ScriptJavaClass.cpp
  28. rsgApi.cpp.rsg
  29. rsgApiFuncDecl.h.rsg
  30. rsgApiReplay.cpp.rsg
  31. rsgApiStructs.h.rsg
  32. rsHandcode.h
  33. rsLocklessFifo.cpp
  34. rsLocklessFifo.h
  35. rsMatrix.cpp
  36. rsMatrix.h
  37. rsMesh.cpp
  38. rsMesh.h
  39. rsMutex.cpp
  40. rsMutex.h
  41. rsObjectBase.cpp
  42. rsObjectBase.h
  43. rsProgram.cpp
  44. rsProgram.h
  45. rsProgramFragment.cpp
  46. rsProgramFragment.h
  47. rsProgramRaster.cpp
  48. rsProgramRaster.h
  49. rsProgramStore.cpp
  50. rsProgramStore.h
  51. rsProgramVertex.cpp
  52. rsProgramVertex.h
  53. rsSampler.cpp
  54. rsSampler.h
  55. rsScript.cpp
  56. rsScript.h
  57. rsScriptC.cpp
  58. rsScriptC.h
  59. rsScriptC_Lib.cpp
  60. rsScriptC_LibCL.cpp
  61. rsScriptC_LibGL.cpp
  62. rsShaderCache.cpp
  63. rsShaderCache.h
  64. rsSignal.cpp
  65. rsSignal.h
  66. rsStream.cpp
  67. rsStream.h
  68. rsThreadIO.cpp
  69. rsThreadIO.h
  70. rsType.cpp
  71. rsType.h
  72. rsUtils.h
  73. rsVertexArray.cpp
  74. rsVertexArray.h
  75. spec.h
  76. spec.l