diff options
author | Stephen Hines <srhines@google.com> | 2014-06-02 22:27:29 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-02 22:27:29 +0000 |
commit | cb28c1890113bc4f6dc18bad83d904cd1757003f (patch) | |
tree | 2020989bcf48364c31c0271a42cd29a2438422f6 /java/tests/ImageProcessing_jb | |
parent | 4fa5ff17f2f083677a695bfe8fcd41478596952a (diff) | |
parent | 87af9fdd7f6dccfaa3f36c0ffa353c41486f3c76 (diff) | |
download | rs-cb28c1890113bc4f6dc18bad83d904cd1757003f.tar.gz |
am 87af9fdd: am b4a053ed: am 1d6ded25: Merge "Updated test files to use the RS_KERNEL macro."
* commit '87af9fdd7f6dccfaa3f36c0ffa353c41486f3c76':
Updated test files to use the RS_KERNEL macro.
Diffstat (limited to 'java/tests/ImageProcessing_jb')
16 files changed, 23 insertions, 23 deletions
diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/artistic1.rs b/java/tests/ImageProcessing_jb/src/com/android/rs/image/artistic1.rs index 8051f29d..2869e16b 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/artistic1.rs +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/artistic1.rs @@ -38,7 +38,7 @@ void setup() { } } -uchar4 __attribute__((kernel)) process(uchar4 in, uint32_t x, uint32_t y) { +uchar4 RS_KERNEL process(uchar4 in, uint32_t x, uint32_t y) { float2 xyDist; xyDist.x = (x * gOverWm1 - 0.5f); xyDist.y = (y * gOverHm1 - 0.5f); diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/blend.rs b/java/tests/ImageProcessing_jb/src/com/android/rs/image/blend.rs index 3f2fdc50..96dfc964 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/blend.rs +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/blend.rs @@ -17,7 +17,7 @@ uchar alpha = 0x0; -uchar4 __attribute__((kernel)) setImageAlpha(uchar4 in, uint32_t x, uint32_t y) { +uchar4 RS_KERNEL setImageAlpha(uchar4 in, uint32_t x, uint32_t y) { uchar4 out; out.rgba = convert_uchar4((convert_uint4(in.rgba) * alpha) >> (uint4)8); out.a = alpha; diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/colorcube.rs b/java/tests/ImageProcessing_jb/src/com/android/rs/image/colorcube.rs index a501ee63..dbdd2f64 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/colorcube.rs +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/colorcube.rs @@ -34,7 +34,7 @@ void setCube(rs_allocation c) { gCoordMul = convert_int4(m * (float4)0x10000); } -uchar4 __attribute__((kernel)) root(uchar4 in) { +uchar4 RS_KERNEL root(uchar4 in) { int4 baseCoord = convert_int4(in) * gCoordMul; int4 coord1 = baseCoord >> (int4)16; int4 coord2 = min(coord1 + 1, gDims - 1); diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/colormatrix.rs b/java/tests/ImageProcessing_jb/src/com/android/rs/image/colormatrix.rs index fa083eac..d13ac647 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/colormatrix.rs +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/colormatrix.rs @@ -27,7 +27,7 @@ void setMatrix(rs_matrix4x4 m) { Mat = m; } -uchar4 __attribute__((kernel)) root(uchar4 in) { +uchar4 RS_KERNEL root(uchar4 in) { float4 f = convert_float4(in); f = rsMatrixMultiply(&Mat, f); f = clamp(f, 0.f, 255.f); diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/contrast.rs b/java/tests/ImageProcessing_jb/src/com/android/rs/image/contrast.rs index 06c18023..71cb8c69 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/contrast.rs +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/contrast.rs @@ -25,7 +25,7 @@ void setBright(float v) { brightC = 127.f - brightM * 127.f; } -uchar4 __attribute__((kernel)) contrast(uchar4 in) { +uchar4 RS_KERNEL contrast(uchar4 in) { float3 v = convert_float3(in.rgb) * brightM + brightC; uchar4 o; o.rgb = convert_uchar3(clamp(v, 0.f, 255.f)); diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/convolve3x3.rs b/java/tests/ImageProcessing_jb/src/com/android/rs/image/convolve3x3.rs index 1b1cf3fb..3d811ced 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/convolve3x3.rs +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/convolve3x3.rs @@ -23,7 +23,7 @@ rs_allocation gIn; float gCoeffs[9]; -uchar4 __attribute__((kernel)) root(uint32_t x, uint32_t y) { +uchar4 RS_KERNEL root(uint32_t x, uint32_t y) { uint32_t x1 = min((int32_t)x+1, gWidth-1); uint32_t x2 = max((int32_t)x-1, 0); uint32_t y1 = min((int32_t)y+1, gHeight-1); diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/convolve5x5.rs b/java/tests/ImageProcessing_jb/src/com/android/rs/image/convolve5x5.rs index ed8461bd..a9ddde20 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/convolve5x5.rs +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/convolve5x5.rs @@ -23,7 +23,7 @@ rs_allocation gIn; float gCoeffs[25]; -uchar4 __attribute__((kernel)) root(uint32_t x, uint32_t y) { +uchar4 RS_KERNEL root(uint32_t x, uint32_t y) { uint32_t x0 = max((int32_t)x-2, 0); uint32_t x1 = max((int32_t)x-1, 0); uint32_t x2 = x; diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/copy.rs b/java/tests/ImageProcessing_jb/src/com/android/rs/image/copy.rs index b69f2dfe..04c86df0 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/copy.rs +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/copy.rs @@ -17,7 +17,7 @@ #include "ip.rsh" #pragma rs_fp_relaxed -uchar4 __attribute__((kernel)) root(uchar4 v_in) { +uchar4 RS_KERNEL root(uchar4 v_in) { return v_in; } diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/exposure.rs b/java/tests/ImageProcessing_jb/src/com/android/rs/image/exposure.rs index b937f70b..cd9e733a 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/exposure.rs +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/exposure.rs @@ -23,7 +23,7 @@ void setBright(float v) { bright = 255.f / (255.f - v); } -uchar4 __attribute__((kernel)) exposure(uchar4 in) +uchar4 RS_KERNEL exposure(uchar4 in) { uchar4 out = 0; out.r = rsClamp((int)(bright * in.r), 0, 255); diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/grain.rs b/java/tests/ImageProcessing_jb/src/com/android/rs/image/grain.rs index b98e21b2..6a883786 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/grain.rs +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/grain.rs @@ -17,7 +17,7 @@ #include "ip.rsh" #pragma rs_fp_relaxed -uchar __attribute__((kernel)) genRand() { +uchar RS_KERNEL genRand() { return (uchar)rsRand(0xff); } @@ -41,7 +41,7 @@ int32_t gWMask; int32_t gHMask; rs_allocation gBlendSource; -uchar __attribute__((kernel)) blend9(uint32_t x, uint32_t y) { +uchar RS_KERNEL blend9(uint32_t x, uint32_t y) { uint32_t x1 = (x-1) & gWMask; uint32_t x2 = (x+1) & gWMask; uint32_t y1 = (y-1) & gHMask; @@ -75,7 +75,7 @@ uchar __attribute__((kernel)) blend9(uint32_t x, uint32_t y) { float gNoiseStrength; rs_allocation gNoise; -uchar4 __attribute__((kernel)) root(uchar4 in, uint32_t x, uint32_t y) { +uchar4 RS_KERNEL root(uchar4 in, uint32_t x, uint32_t y) { float4 ip = convert_float4(in); float pnoise = (float) rsGetElementAt_uchar(gNoise, x & gWMask, y & gHMask); diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/greyscale.rs b/java/tests/ImageProcessing_jb/src/com/android/rs/image/greyscale.rs index 85390105..3ac601d2 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/greyscale.rs +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/greyscale.rs @@ -19,19 +19,19 @@ const static float3 gMonoMult = {0.299f, 0.587f, 0.114f}; -uchar4 __attribute__((kernel)) root(uchar4 v_in) { +uchar4 RS_KERNEL root(uchar4 v_in) { float4 f4 = rsUnpackColor8888(v_in); float3 mono = dot(f4.rgb, gMonoMult); return rsPackColorTo8888(mono); } -uchar __attribute__((kernel)) toU8(uchar4 v_in) { +uchar RS_KERNEL toU8(uchar4 v_in) { float4 f4 = convert_float4(v_in); return (uchar)dot(f4.rgb, gMonoMult); } -uchar4 __attribute__((kernel)) toU8_4(uchar v_in) { +uchar4 RS_KERNEL toU8_4(uchar v_in) { return (uchar4)v_in; } diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/mandelbrot.rs b/java/tests/ImageProcessing_jb/src/com/android/rs/image/mandelbrot.rs index 5429acdd..99451f06 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/mandelbrot.rs +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/mandelbrot.rs @@ -22,7 +22,7 @@ float lowerBoundX = -2.f; float lowerBoundY = -2.f; float scaleFactor = 4.f; -uchar4 __attribute__((kernel)) root(uint32_t x, uint32_t y) { +uchar4 RS_KERNEL root(uint32_t x, uint32_t y) { float2 p; p.x = lowerBoundX + ((float)x / gDimX) * scaleFactor; p.y = lowerBoundY + ((float)y / gDimY) * scaleFactor; @@ -54,7 +54,7 @@ uchar4 __attribute__((kernel)) root(uint32_t x, uint32_t y) { } } -uchar4 __attribute__((kernel)) rootD(uint32_t x, uint32_t y) { +uchar4 RS_KERNEL rootD(uint32_t x, uint32_t y) { double2 p; p.x = lowerBoundX + ((float)x / gDimX) * scaleFactor; p.y = lowerBoundY + ((float)y / gDimY) * scaleFactor; diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/shadows.rs b/java/tests/ImageProcessing_jb/src/com/android/rs/image/shadows.rs index 2f061047..f852aae8 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/shadows.rs +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/shadows.rs @@ -183,7 +183,7 @@ void prepareShadows(float scale) { } } -uchar4 __attribute__((kernel)) shadowsKernel(uchar4 in) { +uchar4 RS_KERNEL shadowsKernel(uchar4 in) { ushort3 hsv = rgb2hsv(in); float v = (fastevalPoly(poly, 5, hsv.x * (1.f / 4080.f)) * 4080.f); hsv.x = (unsigned short) clamp(v, 0.f, 4080.f); diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/threshold.rs b/java/tests/ImageProcessing_jb/src/com/android/rs/image/threshold.rs index d30a87b5..40d4fa2d 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/threshold.rs +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/threshold.rs @@ -70,11 +70,11 @@ void setRadius(int rad) { } } -float4 __attribute__((kernel)) copyIn(uchar4 in) { +float4 RS_KERNEL copyIn(uchar4 in) { return convert_float4(in); } -uchar4 __attribute__((kernel)) vert(uint32_t x, uint32_t y) { +uchar4 RS_KERNEL vert(uint32_t x, uint32_t y) { float3 blurredPixel = 0; int gi = 0; uchar4 out; @@ -96,7 +96,7 @@ uchar4 __attribute__((kernel)) vert(uint32_t x, uint32_t y) { return out; } -float4 __attribute__((kernel)) horz(uint32_t x, uint32_t y) { +float4 RS_KERNEL horz(uint32_t x, uint32_t y) { float4 blurredPixel = 0; int gi = 0; if ((x > radius) && (x < (width - radius))) { diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/vibrance.rs b/java/tests/ImageProcessing_jb/src/com/android/rs/image/vibrance.rs index 7fa295e8..865c77ef 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/vibrance.rs +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/vibrance.rs @@ -25,7 +25,7 @@ static const float Bf = 0.114f; static float Vib = 0.f; -uchar4 __attribute__((kernel)) vibranceKernel(uchar4 in) { +uchar4 RS_KERNEL vibranceKernel(uchar4 in) { int r = in.r; int g = in.g; int b = in.b; diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/wbalance.rs b/java/tests/ImageProcessing_jb/src/com/android/rs/image/wbalance.rs index c8036409..58f64d10 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/wbalance.rs +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/wbalance.rs @@ -118,7 +118,7 @@ void prepareWhiteBalance() { scale.b = avg/estimation.b; } -uchar4 __attribute__((kernel)) whiteBalanceKernel(uchar4 in) { +uchar4 RS_KERNEL whiteBalanceKernel(uchar4 in) { float3 t = convert_float3(in.rgb); t *= scale; t = min(t, 255.f); |