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

Commit 86ef7977 authored by Robert Ly's avatar Robert Ly Committed by Android (Google) Code Review
Browse files

Merge "cherrypick from hc mr1 Change-Id:... 

Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06a" into honeycomb-mr2
parents cbd31aec f197b639

docs/html/guide/guide_toc.cs

+17 −3
Original line number Diff line number Diff line
@@ -244,9 +244,6 @@ 
          <li><a href="<?cs var:toroot ?>guide/topics/graphics/opengl.html">

                <span class="en">3D with OpenGL</span>

              </a></li>

          <li><a href="<?cs var:toroot ?>guide/topics/graphics/renderscript.html">

                <span class="en">3D with Renderscript</span>

              </a></li>

          <li><a href="<?cs var:toroot ?>guide/topics/graphics/animation.html">

                <span class="en">Property Animation</span>

              </a></li>
@@ -255,6 +252,23 @@ 
              </a></li>

        </ul>

      </li>

      <li class="toggle-list">

	        <div><a href="<?cs var:toroot ?>guide/topics/renderscript/index.html">

	            <span class="en">RenderScript</span>

	          </a>

	          <span class="new-child">new!</span></div>

	        <ul>

	          <li><a href="<?cs var:toroot ?>guide/topics/renderscript/graphics.html">

	                <span class="en">3D Graphics</span>

	              </a>

	          </li>

	          <li><a href="<?cs var:toroot ?>guide/topics/renderscript/compute.html">

	                <span class="en">Compute</span>

	              </a>

	          </li>         

	        </ul>

  	  </li>



      <li><a href="<?cs var:toroot ?>guide/topics/media/index.html">

            <span class="en">Audio and Video</span>

          </a></li>

docs/html/guide/topics/graphics/renderscript.html

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<html>

<head>

<meta http-equiv="refresh" content="0;url=http://developer.android.com/guide/topics/renderscript/index.html">

<title>Redirecting...</title>

</head>

<body>

<p>You should be redirected. Please <a

href="http://developer.android.com/guide/topics/renderscript/index.html">click here</a>.</p>

</body>

</html>
 
 No newline at end of file

docs/html/guide/topics/graphics/renderscript.jd

deleted100644 → 0
+0 −716

File deleted.

Preview size limit exceeded, changes collapsed.

docs/html/guide/topics/renderscript/compute.jd

0 → 100644
+38 −0
Original line number Diff line number Diff line 
page.title=Compute

parent.title=RenderScript

parent.link=index.html 

@jd:body



  <div id="qv-wrapper">

    <div id="qv">



      <h2>Related Samples</h2>



      <ol>

        <li><a href="{@docRoot}resources/samples/RenderScript/HelloCompute/index.html">Hello

        Compute</a></li>

        <li><a href="{@docRoot}resources/samples/RenderScript/Balls/index.html">Balls</a></li>

      </ol>

    </div>

  </div>



  <p>RenderScript exposes a set of compute APIs that you can use to do intensive computational operations.

  You can use the compute APIs in the context of a graphics RenderScript such as calculating the

  transformation of many geometric objects in a scene. You can also create a standalone compute RenderScript that does not

  draw anything to the screen such as bitmap image processing for a photo editor application.

  The RenderScript compute APIs are mainly defined in the <code>rs_cl.rsh</code> header</p>

  

  <p>Compute RenderScripts are simpler to setup and implement as there is no graphics rendering involved.

  You can offload computational aspects of your application to RenderScript by creating a native RenderScript

  file (.rs) and using the generated reflected layer class to call functions in the <code>.rs</code> file. 



  <p>See the <a href="{@docRoot}resources/samples/RenderScript/HelloCompute/index.html">HelloCompute</a>

  sample in the Android SDK for more

  information on how to create a simple compute RenderScript.</p>

  <p>  

  See the <a href="{@docRoot}resources/samples/RenderScript/Balls/index.html">Balls</a>

  sample in the Android SDK for more

  information on how to create a compute RenderScript that is used in a graphics RenderScript.

  The compute RenderScript is contained in 

  <a href="{@docRoot}resources/samples/RenderScript/Balls/src/com/example/android/rs/balls/ball_physics.html">balls_physics.rs</a>.

  </p>
 
 No newline at end of file

docs/html/guide/topics/renderscript/graphics.jd

0 → 100644
+619 −0

File added.

Preview size limit exceeded, changes collapsed.