From 8cb39de03aef6097a90033600d11a60ae000a6e4 Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Tue, 1 Jun 2010 15:47:01 -0700 Subject: 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 --- libs/rs/scriptc/rs_core.rsh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libs/rs/scriptc') 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); -- cgit v1.1