diff options
| author | Jason Sams <rjsams@android.com> | 2010-06-01 15:47:01 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-06-01 15:47:01 -0700 |
| commit | 8cb39de03aef6097a90033600d11a60ae000a6e4 (patch) | |
| tree | cc9eb5fa87de5e14713684e7e177368d10550384 /libs/rs/scriptc | |
| parent | c9d0a87d504b3f0322b43f971f9cb4838ee521fb (diff) | |
| download | frameworks_base-8cb39de03aef6097a90033600d11a60ae000a6e4.zip frameworks_base-8cb39de03aef6097a90033600d11a60ae000a6e4.tar.gz frameworks_base-8cb39de03aef6097a90033600d11a60ae000a6e4.tar.bz2 | |
Remove RS_KIND from vertex arrays types.
Legacy vertex programs now bind by name just like the user programs.
This removes the need for two different ways of declairing the same
information.
Change-Id: I0178c0962842a1bbffb6726984ae1b8f5bb7529c
Diffstat (limited to 'libs/rs/scriptc')
| -rw-r--r-- | libs/rs/scriptc/rs_core.rsh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/rs/scriptc/rs_core.rsh b/libs/rs/scriptc/rs_core.rsh index a2a5bab..c0ba4af 100644 --- a/libs/rs/scriptc/rs_core.rsh +++ b/libs/rs/scriptc/rs_core.rsh @@ -1,10 +1,10 @@ #ifndef __RS_CORE_RSH__ #define __RS_CORE_RSH__ -uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b); -uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b, float a); +//uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b); +//uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b, float a); -uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b) +static uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b) { uchar4 c; c.x = (uchar)(r * 255.f); @@ -14,7 +14,7 @@ uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b return c; } -uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b, float a) +static uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b, float a) { uchar4 c; c.x = (uchar)(r * 255.f); |