Google Git
Sign in
android / platform / frameworks / rs / refs/heads/marshmallow-mr3-release
commitd1fdfc12e1b52b362452bc08ffaf472ff7c8c491[log] [tgz]
authorJean-Luc Brouillet <[email protected]>Thu Aug 20 17:30:41 2015 -0700
committerJean-Luc Brouillet <[email protected]>Thu Aug 20 19:49:44 2015 -0700
treefdc4b11c26e2c4176d97535394385c8cc96a5c36
parent966f28aea042b69caa614182c8f1f30f8d709a7c [diff]
Restore missing min and max API.

min(float2/3/4, float) and max(float2/3/4, float) were defined in our
headers in K.  In L, they were removed by mistake.  This continued to
work however because a float would be auto converted by the compiler to
a float4.

In M, we started validating for unexpected external references, which
_Z3minDv4_ff is.  This can prevent programs compiled with K from running
on M.

This CL restores the declarations.  Corresponding CLs will fix the whitelist
and add CTS tests.

Bug:23389429

Change-Id: I3f91830a14b7e01cf1b6ea954fa6dd2fc9d71286
(cherry picked from commit 7cf263d593c057af8da8d57025e7315c4ed21ea2)
2 files changed
tree: fdc4b11c26e2c4176d97535394385c8cc96a5c36
  1. api/
  2. cpp/
  3. cpu_ref/
  4. driver/
  5. java/
  6. scriptc/
  7. server/
  8. tests/
  9. Android.mk
  10. CleanSpec.mk
  11. rs.h
  12. rs.spec
  13. rs_hal.h
  14. rsAdapter.cpp
  15. rsAdapter.h
  16. rsAllocation.cpp
  17. rsAllocation.h
  18. rsAnimation.cpp
  19. rsAnimation.h
  20. rsClosure.cpp
  21. rsClosure.h
  22. rsCompatibilityLib.cpp
  23. rsCompatibilityLib.h
  24. rsComponent.cpp
  25. rsComponent.h
  26. rsContext.cpp
  27. rsContext.h
  28. rsCppUtils.cpp
  29. rsCppUtils.h
  30. rsDebugHelper.h
  31. rsDefines.h
  32. rsDevice.cpp
  33. rsDevice.h
  34. rsDriverLoader.cpp
  35. rsElement.cpp
  36. rsElement.h
  37. rsEnv.h
  38. rsFBOCache.cpp
  39. rsFBOCache.h
  40. rsFifo.h
  41. rsFifoSocket.cpp
  42. rsFifoSocket.h
  43. rsFileA3D.cpp
  44. rsFileA3D.h
  45. rsFont.cpp
  46. rsFont.h
  47. rsg.spec
  48. rsg_generator.c
  49. rsgApi.cpp.rsg
  50. rsgApiFuncDecl.h.rsg
  51. rsgApiReplay.cpp.rsg
  52. rsgApiStructs.h.rsg
  53. rsGrallocConsumer.cpp
  54. rsGrallocConsumer.h
  55. rsInternalDefines.h
  56. rsList.h
  57. rsMap.h
  58. rsMatrix2x2.cpp
  59. rsMatrix2x2.h
  60. rsMatrix3x3.cpp
  61. rsMatrix3x3.h
  62. rsMatrix4x4.cpp
  63. rsMatrix4x4.h
  64. rsMesh.cpp
  65. rsMesh.h
  66. rsMutex.cpp
  67. rsMutex.h
  68. rsObjectBase.cpp
  69. rsObjectBase.h
  70. rsProgram.cpp
  71. rsProgram.h
  72. rsProgramBase.h
  73. rsProgramFragment.cpp
  74. rsProgramFragment.h
  75. rsProgramRaster.cpp
  76. rsProgramRaster.h
  77. rsProgramStore.cpp
  78. rsProgramStore.h
  79. rsProgramVertex.cpp
  80. rsProgramVertex.h
  81. rsRuntime.h
  82. rsSampler.cpp
  83. rsSampler.h
  84. rsScript.cpp
  85. rsScript.h
  86. rsScriptC.cpp
  87. rsScriptC.h
  88. rsScriptC_Lib.cpp
  89. rsScriptC_LibGL.cpp
  90. rsScriptGroup.cpp
  91. rsScriptGroup.h
  92. rsScriptGroup2.cpp
  93. rsScriptGroup2.h
  94. rsScriptGroupBase.h
  95. rsScriptIntrinsic.cpp
  96. rsScriptIntrinsic.h
  97. rsSignal.cpp
  98. rsSignal.h
  99. rsStream.cpp
  100. rsStream.h
  101. rsThreadIO.cpp
  102. rsThreadIO.h
  103. rsType.cpp
  104. rsType.h
  105. rsUtils.h
  106. run_rs_cts.sh
  107. spec.h
  108. spec.l
  109. update_rs_prebuilts.sh