Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3aa6c586 authored by Stephen Hines's avatar Stephen Hines Committed by Android Git Automerger
Browse files

am a13980ce: am ce6b9db4: Merge "Update docs for RS object API fixes." 

* commit 'a13980ce':
  Update docs for RS object API fixes.
parents 4d3e0f8b a13980ce

docs/html/guide/topics/renderscript/reference/rs_graphics.jd

+11 −35
Original line number Diff line number Diff line
@@ -599,11 +599,7 @@ depth to that found in the depth buffer. 
    <span class='normal'>: Handle to a Font</span>

  </h4>

  <div class='jd-details-descr'>

<p>A typedef of: _RS_HANDLE __attribute__((

#if (defined(RS_VERSION) && (RS_VERSION >= 1))

deprecated

#endif

))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>

<p>When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>

</p>

    <p><b>Deprecated.</b>  Do not use.</p>

<p> Opaque handle to a RenderScript font object.
@@ -619,11 +615,7 @@ See: android.renderscript.Font 
    <span class='normal'>: Handle to a Mesh</span>

  </h4>

  <div class='jd-details-descr'>

<p>A typedef of: _RS_HANDLE __attribute__((

#if (defined(RS_VERSION) && (RS_VERSION >= 1))

deprecated

#endif

))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>

<p>When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>

</p>

    <p><b>Deprecated.</b>  Do not use.</p>

<p> Opaque handle to a RenderScript mesh object.
@@ -664,11 +656,7 @@ See: android.renderscript.Mesh 
    <span class='normal'>: Handle to a ProgramFragment</span>

  </h4>

  <div class='jd-details-descr'>

<p>A typedef of: _RS_HANDLE __attribute__((

#if (defined(RS_VERSION) && (RS_VERSION >= 1))

deprecated

#endif

))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>

<p>When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>

</p>

    <p><b>Deprecated.</b>  Do not use.</p>

<p> Opaque handle to a RenderScript ProgramFragment object.
@@ -684,11 +672,7 @@ See: android.renderscript.ProgramFragment 
    <span class='normal'>: Handle to a ProgramRaster</span>

  </h4>

  <div class='jd-details-descr'>

<p>A typedef of: _RS_HANDLE __attribute__((

#if (defined(RS_VERSION) && (RS_VERSION >= 1))

deprecated

#endif

))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>

<p>When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>

</p>

    <p><b>Deprecated.</b>  Do not use.</p>

<p> Opaque handle to a RenderScript ProgramRaster object.
@@ -704,11 +688,7 @@ See: android.renderscript.ProgramRaster 
    <span class='normal'>: Handle to a ProgramStore</span>

  </h4>

  <div class='jd-details-descr'>

<p>A typedef of: _RS_HANDLE __attribute__((

#if (defined(RS_VERSION) && (RS_VERSION >= 1))

deprecated

#endif

))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>

<p>When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>

</p>

    <p><b>Deprecated.</b>  Do not use.</p>

<p> Opaque handle to a RenderScript ProgramStore object.
@@ -724,11 +704,7 @@ See: android.renderscript.ProgramStore 
    <span class='normal'>: Handle to a ProgramVertex</span>

  </h4>

  <div class='jd-details-descr'>

<p>A typedef of: _RS_HANDLE __attribute__((

#if (defined(RS_VERSION) && (RS_VERSION >= 1))

deprecated

#endif

))&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;    When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>

<p>When compiling for 32 bits. Removed from <a href='http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels'>API level 23 and higher</a>

</p>

    <p><b>Deprecated.</b>  Do not use.</p>

<p> Opaque handle to a RenderScript ProgramVertex object.

docs/html/guide/topics/renderscript/reference/rs_object_types.jd

+10 −10
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ elements, and scripts. Most of these object are created using the Java RenderSc 
    <span class='normal'>: Handle to an allocation</span>

  </h4>

  <div class='jd-details-descr'>

<p>A typedef of: _RS_HANDLE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>

<p></p>

<p> An opaque handle to a RenderScript allocation.

</p>
@@ -253,7 +253,7 @@ as a single unit for packing and alignment purposes. 
    <span class='normal'>: Handle to an element</span>

  </h4>

  <div class='jd-details-descr'>

<p>A typedef of: _RS_HANDLE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>

<p></p>

<p> An opaque handle to a RenderScript element.

</p>
@@ -269,7 +269,7 @@ as a single unit for packing and alignment purposes. 
    <span class='normal'>: Handle to a Sampler</span>

  </h4>

  <div class='jd-details-descr'>

<p>A typedef of: _RS_HANDLE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>

<p></p>

<p> An opaque handle to a RenderScript sampler object.

</p>
@@ -308,7 +308,7 @@ as a single unit for packing and alignment purposes. 
    <span class='normal'>: Handle to a Script</span>

  </h4>

  <div class='jd-details-descr'>

<p>A typedef of: _RS_HANDLE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>

<p></p>

<p> An opaque handle to a RenderScript script object.

</p>
@@ -324,7 +324,7 @@ as a single unit for packing and alignment purposes. 
    <span class='normal'>: Handle to a Type</span>

  </h4>

  <div class='jd-details-descr'>

<p>A typedef of: _RS_HANDLE&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>

<p></p>

<p> An opaque handle to a RenderScript type.

</p>

docs/html/guide/topics/renderscript/reference/rs_for_each.jd

+1 −1

File changed.

Contains only whitespace changes.

docs/html/guide/topics/renderscript/reference/rs_time.jd

+2 −2

File changed.

Contains only whitespace changes.

docs/html/guide/topics/renderscript/reference/rs_value_types.jd

+12 −12

File changed.

Contains only whitespace changes.