Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '3460304c5c656b2cbf2b371720edff4fd662b02d':
  Update RS docs for M-related changes.
This commit is contained in:
Stephen Hines
2015-09-11 02:47:16 +00:00
committed by Android Git Automerger
parent 449274a774 3460304c5c
commit 12f2724bc9
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
docs/html/guide/topics/renderscript/reference/rs_math.jd
View File

@@ -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>

2
docs/html/guide/topics/renderscript/reference/rs_value_types.jd
View File

@@ -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.