summaryrefslogtreecommitdiffstats
path: root/libs/rs/scriptc
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-06-21 17:42:41 -0700
committerJason Sams <rjsams@android.com>2010-06-21 17:42:41 -0700
commitf110d4b787b91dabe968a812e76e5c1f8d953487 (patch)
tree65d71a0acb1441510240bec336535898a27d59e7 /libs/rs/scriptc
parent3ac8da87bba83de254e612ff8387db23e6434119 (diff)
downloadframeworks_base-f110d4b787b91dabe968a812e76e5c1f8d953487.zip
frameworks_base-f110d4b787b91dabe968a812e76e5c1f8d953487.tar.gz
frameworks_base-f110d4b787b91dabe968a812e76e5c1f8d953487.tar.bz2
Move ImageProcessing and ModelViewer to reflected files.
Implement boolean support. Change-Id: Iac2dc28067ac430b3e413fc651dfaa0b96214e2e
Diffstat (limited to 'libs/rs/scriptc')
-rw-r--r--libs/rs/scriptc/rs_cl.rsh6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/rs/scriptc/rs_cl.rsh b/libs/rs/scriptc/rs_cl.rsh
index 69e7902..64844a4 100644
--- a/libs/rs/scriptc/rs_cl.rsh
+++ b/libs/rs/scriptc/rs_cl.rsh
@@ -7,15 +7,15 @@
// Conversions
#define CVT_FUNC_2(typeout, typein) \
static typeout##2 __attribute__((overloadable)) convert_##typeout##2(typein##2 v) { \
- typeout##2 r = {v.x, v.y}; \
+ typeout##2 r = {(typeout)v.x, (typeout)v.y}; \
return r; \
} \
static typeout##3 __attribute__((overloadable)) convert_##typeout##3(typein##3 v) { \
- typeout##3 r = {v.x, v.y, v.z}; \
+ typeout##3 r = {(typeout)v.x, (typeout)v.y, (typeout)v.z}; \
return r; \
} \
static typeout##4 __attribute__((overloadable)) convert_##typeout##4(typein##4 v) { \
- typeout##4 r = {v.x, v.y, v.z, v.w}; \
+ typeout##4 r = {(typeout)v.x, (typeout)v.y, (typeout)v.z, (typeout)v.w}; \
return r; \
}