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

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

am 12f2724b: am 3460304c: Merge "Update RS docs for M-related changes." 

* commit '12f2724b':
  Update RS docs for M-related changes.
parents 3f7c4bdb 12f2724b

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

+30 −0
Original line number Diff line number Diff line
@@ -3964,16 +3964,31 @@ In rs_fp_relaxed mode, mad() may not do the rounding after multiplicaiton. 
      </tr>

      <tr>

        <td>float max(float a, float b);

</td>

        <td>        </td>

      </tr>

      <tr>

        <td><a href='rs_value_types.html#android_rs:float2'>float2</a> max(<a href='rs_value_types.html#android_rs:float2'>float2</a> a, float b);

</td>

        <td>        </td>

      </tr>

      <tr>

        <td><a href='rs_value_types.html#android_rs:float2'>float2</a> max(<a href='rs_value_types.html#android_rs:float2'>float2</a> a, <a href='rs_value_types.html#android_rs:float2'>float2</a> b);

</td>

        <td>        </td>

      </tr>

      <tr>

        <td><a href='rs_value_types.html#android_rs:float3'>float3</a> max(<a href='rs_value_types.html#android_rs:float3'>float3</a> a, float b);

</td>

        <td>        </td>

      </tr>

      <tr>

        <td><a href='rs_value_types.html#android_rs:float3'>float3</a> max(<a href='rs_value_types.html#android_rs:float3'>float3</a> a, <a href='rs_value_types.html#android_rs:float3'>float3</a> b);

</td>

        <td>        </td>

      </tr>

      <tr>

        <td><a href='rs_value_types.html#android_rs:float4'>float4</a> max(<a href='rs_value_types.html#android_rs:float4'>float4</a> a, float b);

</td>

        <td>        </td>

      </tr>
@@ -4168,16 +4183,31 @@ In rs_fp_relaxed mode, mad() may not do the rounding after multiplicaiton. 
      </tr>

      <tr>

        <td>float min(float a, float b);

</td>

        <td>        </td>

      </tr>

      <tr>

        <td><a href='rs_value_types.html#android_rs:float2'>float2</a> min(<a href='rs_value_types.html#android_rs:float2'>float2</a> a, float b);

</td>

        <td>        </td>

      </tr>

      <tr>

        <td><a href='rs_value_types.html#android_rs:float2'>float2</a> min(<a href='rs_value_types.html#android_rs:float2'>float2</a> a, <a href='rs_value_types.html#android_rs:float2'>float2</a> b);

</td>

        <td>        </td>

      </tr>

      <tr>

        <td><a href='rs_value_types.html#android_rs:float3'>float3</a> min(<a href='rs_value_types.html#android_rs:float3'>float3</a> a, float b);

</td>

        <td>        </td>

      </tr>

      <tr>

        <td><a href='rs_value_types.html#android_rs:float3'>float3</a> min(<a href='rs_value_types.html#android_rs:float3'>float3</a> a, <a href='rs_value_types.html#android_rs:float3'>float3</a> b);

</td>

        <td>        </td>

      </tr>

      <tr>

        <td><a href='rs_value_types.html#android_rs:float4'>float4</a> min(<a href='rs_value_types.html#android_rs:float4'>float4</a> a, float b);

</td>

        <td>        </td>

      </tr>

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

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ E.g. <a href='rs_value_types.html#android_rs:float4'>float4</a>, <a href='rs_val 
</p>



<p> To create vector literals, use the vector type followed by the values enclosed

between parentheses, e.g. <code>(float3)(1.0f, 2.0f, 3.0f)</code>.

between curly braces, e.g. <code>(float3){1.0f, 2.0f, 3.0f}</code>.

</p>



<p> Entries of a vector can be accessed using different naming styles.