Skip to content

Commit 07e35aa

Browse files
author
Jean-Baptiste Queru
committed
Merge into jb-mr1-dev
Change-Id: Ic72c475635a0eb57a77d3bd621a219001af8baa5
2 parents 7951c45 + ae76051 commit 07e35aa

File tree

3 files changed

+44
-44
lines changed

3 files changed

+44
-44
lines changed

‎tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/convolve3x3.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ void root(uchar4 *out, uint32_t x, uint32_t y) {
3030
uint32_t y1 = min((int32_t)y+1, gHeight-1);
3131
uint32_t y2 = max((int32_t)y-1, 0);
3232

33-
float4 p00 = convert_float4(((uchar4 *)rsGetElementAt(gIn, x1, y1))[0]);
34-
float4 p01 = convert_float4(((uchar4 *)rsGetElementAt(gIn, x, y1))[0]);
35-
float4 p02 = convert_float4(((uchar4 *)rsGetElementAt(gIn, x2, y1))[0]);
36-
float4 p10 = convert_float4(((uchar4 *)rsGetElementAt(gIn, x1, y))[0]);
37-
float4 p11 = convert_float4(((uchar4 *)rsGetElementAt(gIn, x, y))[0]);
38-
float4 p12 = convert_float4(((uchar4 *)rsGetElementAt(gIn, x2, y))[0]);
39-
float4 p20 = convert_float4(((uchar4 *)rsGetElementAt(gIn, x1, y2))[0]);
40-
float4 p21 = convert_float4(((uchar4 *)rsGetElementAt(gIn, x, y2))[0]);
41-
float4 p22 = convert_float4(((uchar4 *)rsGetElementAt(gIn, x2, y2))[0]);
33+
float4 p00 = convert_float4(rsGetElementAt_uchar4(gIn, x1, y1));
34+
float4 p01 = convert_float4(rsGetElementAt_uchar4(gIn, x, y1));
35+
float4 p02 = convert_float4(rsGetElementAt_uchar4(gIn, x2, y1));
36+
float4 p10 = convert_float4(rsGetElementAt_uchar4(gIn, x1, y));
37+
float4 p11 = convert_float4(rsGetElementAt_uchar4(gIn, x, y));
38+
float4 p12 = convert_float4(rsGetElementAt_uchar4(gIn, x2, y));
39+
float4 p20 = convert_float4(rsGetElementAt_uchar4(gIn, x1, y2));
40+
float4 p21 = convert_float4(rsGetElementAt_uchar4(gIn, x, y2));
41+
float4 p22 = convert_float4(rsGetElementAt_uchar4(gIn, x2, y2));
4242
p00 *= gCoeffs[0];
4343
p01 *= gCoeffs[1];
4444
p02 *= gCoeffs[2];

‎tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/convolve5x5.rs‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -37,35 +37,35 @@ void root(uchar4 *out, uint32_t x, uint32_t y) {
3737
uint32_t y3 = min((int32_t)y+1, gHeight-1);
3838
uint32_t y4 = min((int32_t)y+2, gHeight-1);
3939

40-
float4 p0 = convert_float4(((uchar4 *)rsGetElementAt(gIn, x0, y0))[0]) * gCoeffs[0]
41-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x1, y0))[0]) * gCoeffs[1]
42-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x2, y0))[0]) * gCoeffs[2]
43-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x3, y0))[0]) * gCoeffs[3]
44-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x4, y0))[0]) * gCoeffs[4];
40+
float4 p0 = convert_float4(rsGetElementAt_uchar4(gIn, x0, y0)) * gCoeffs[0]
41+
+ convert_float4(rsGetElementAt_uchar4(gIn, x1, y0)) * gCoeffs[1]
42+
+ convert_float4(rsGetElementAt_uchar4(gIn, x2, y0)) * gCoeffs[2]
43+
+ convert_float4(rsGetElementAt_uchar4(gIn, x3, y0)) * gCoeffs[3]
44+
+ convert_float4(rsGetElementAt_uchar4(gIn, x4, y0)) * gCoeffs[4];
4545

46-
float4 p1 = convert_float4(((uchar4 *)rsGetElementAt(gIn, x0, y1))[0]) * gCoeffs[5]
47-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x1, y1))[0]) * gCoeffs[6]
48-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x2, y1))[0]) * gCoeffs[7]
49-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x3, y1))[0]) * gCoeffs[8]
50-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x4, y1))[0]) * gCoeffs[9];
46+
float4 p1 = convert_float4(rsGetElementAt_uchar4(gIn, x0, y1)) * gCoeffs[5]
47+
+ convert_float4(rsGetElementAt_uchar4(gIn, x1, y1)) * gCoeffs[6]
48+
+ convert_float4(rsGetElementAt_uchar4(gIn, x2, y1)) * gCoeffs[7]
49+
+ convert_float4(rsGetElementAt_uchar4(gIn, x3, y1)) * gCoeffs[8]
50+
+ convert_float4(rsGetElementAt_uchar4(gIn, x4, y1)) * gCoeffs[9];
5151

52-
float4 p2 = convert_float4(((uchar4 *)rsGetElementAt(gIn, x0, y2))[0]) * gCoeffs[10]
53-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x1, y2))[0]) * gCoeffs[11]
54-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x2, y2))[0]) * gCoeffs[12]
55-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x3, y2))[0]) * gCoeffs[13]
56-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x4, y2))[0]) * gCoeffs[14];
52+
float4 p2 = convert_float4(rsGetElementAt_uchar4(gIn, x0, y2)) * gCoeffs[10]
53+
+ convert_float4(rsGetElementAt_uchar4(gIn, x1, y2)) * gCoeffs[11]
54+
+ convert_float4(rsGetElementAt_uchar4(gIn, x2, y2)) * gCoeffs[12]
55+
+ convert_float4(rsGetElementAt_uchar4(gIn, x3, y2)) * gCoeffs[13]
56+
+ convert_float4(rsGetElementAt_uchar4(gIn, x4, y2)) * gCoeffs[14];
5757

58-
float4 p3 = convert_float4(((uchar4 *)rsGetElementAt(gIn, x0, y3))[0]) * gCoeffs[15]
59-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x1, y3))[0]) * gCoeffs[16]
60-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x2, y3))[0]) * gCoeffs[17]
61-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x3, y3))[0]) * gCoeffs[18]
62-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x4, y3))[0]) * gCoeffs[19];
58+
float4 p3 = convert_float4(rsGetElementAt_uchar4(gIn, x0, y3)) * gCoeffs[15]
59+
+ convert_float4(rsGetElementAt_uchar4(gIn, x1, y3)) * gCoeffs[16]
60+
+ convert_float4(rsGetElementAt_uchar4(gIn, x2, y3)) * gCoeffs[17]
61+
+ convert_float4(rsGetElementAt_uchar4(gIn, x3, y3)) * gCoeffs[18]
62+
+ convert_float4(rsGetElementAt_uchar4(gIn, x4, y3)) * gCoeffs[19];
6363

64-
float4 p4 = convert_float4(((uchar4 *)rsGetElementAt(gIn, x0, y4))[0]) * gCoeffs[20]
65-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x1, y4))[0]) * gCoeffs[21]
66-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x2, y4))[0]) * gCoeffs[22]
67-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x3, y4))[0]) * gCoeffs[23]
68-
+ convert_float4(((uchar4 *)rsGetElementAt(gIn, x4, y4))[0]) * gCoeffs[24];
64+
float4 p4 = convert_float4(rsGetElementAt_uchar4(gIn, x0, y4)) * gCoeffs[20]
65+
+ convert_float4(rsGetElementAt_uchar4(gIn, x1, y4)) * gCoeffs[21]
66+
+ convert_float4(rsGetElementAt_uchar4(gIn, x2, y4)) * gCoeffs[22]
67+
+ convert_float4(rsGetElementAt_uchar4(gIn, x3, y4)) * gCoeffs[23]
68+
+ convert_float4(rsGetElementAt_uchar4(gIn, x4, y4)) * gCoeffs[24];
6969

7070
p0 = clamp(p0 + p1 + p2 + p3 + p4, 0.f, 255.f);
7171
*out = convert_uchar4(p0);

‎tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/grain.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ void blend9(uchar *out, uint32_t x, uint32_t y) {
4848
uint32_t y1 = min((int32_t)y+1, (int32_t)(gHeight -1));
4949
uint32_t y2 = max((int32_t)y-1, (int32_t)0);
5050

51-
uint p00 = 56 * ((uchar *)rsGetElementAt(gBlendSource, x1, y1))[0];
52-
uint p01 = 114 * ((uchar *)rsGetElementAt(gBlendSource, x, y1))[0];
53-
uint p02 = 56 * ((uchar *)rsGetElementAt(gBlendSource, x2, y1))[0];
54-
uint p10 = 114 * ((uchar *)rsGetElementAt(gBlendSource, x1, y))[0];
55-
uint p11 = 230 * ((uchar *)rsGetElementAt(gBlendSource, x, y))[0];
56-
uint p12 = 114 * ((uchar *)rsGetElementAt(gBlendSource, x2, y))[0];
57-
uint p20 = 56 * ((uchar *)rsGetElementAt(gBlendSource, x1, y2))[0];
58-
uint p21 = 114 * ((uchar *)rsGetElementAt(gBlendSource, x, y2))[0];
59-
uint p22 = 56 * ((uchar *)rsGetElementAt(gBlendSource, x2, y2))[0];
51+
uint p00 = 56 * rsGetElementAt_uchar(gBlendSource, x1, y1);
52+
uint p01 = 114 * rsGetElementAt_uchar(gBlendSource, x, y1);
53+
uint p02 = 56 * rsGetElementAt_uchar(gBlendSource, x2, y1);
54+
uint p10 = 114 * rsGetElementAt_uchar(gBlendSource, x1, y);
55+
uint p11 = 230 * rsGetElementAt_uchar(gBlendSource, x, y);
56+
uint p12 = 114 * rsGetElementAt_uchar(gBlendSource, x2, y);
57+
uint p20 = 56 * rsGetElementAt_uchar(gBlendSource, x1, y2);
58+
uint p21 = 114 * rsGetElementAt_uchar(gBlendSource, x, y2);
59+
uint p22 = 56 * rsGetElementAt_uchar(gBlendSource, x2, y2);
6060

6161
p00 += p01;
6262
p02 += p10;
@@ -78,7 +78,7 @@ float gNoiseStrength;
7878
rs_allocation gNoise;
7979
void root(const uchar4 *in, uchar4 *out, uint32_t x, uint32_t y) {
8080
float4 ip = convert_float4(*in);
81-
float pnoise = (float) ((uchar *)rsGetElementAt(gNoise, x, y))[0];
81+
float pnoise = (float) rsGetElementAt_uchar(gNoise, x, y);
8282

8383
float energy_level = ip.r + ip.g + ip.b;
8484
float energy_mask = (28.f - sqrt(energy_level)) * 0.03571f;

0 commit comments

Comments
 (0)