Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "types update."

Browse Source
This commit is contained in:
Jason Sams
2010-06-01 16:58:15 -07:00
committed by Android (Google) Code Review
parent 491271d3f5 c9d0a87d50
commit 9e83c02917
3 changed files with 63 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
libs/rs/scriptc/rs_core.rsh Normal file
View File

@@ -0,0 +1,61 @@
#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 c;
c.x = (uchar)(r * 255.f);
c.y = (uchar)(g * 255.f);
c.z = (uchar)(b * 255.f);
c.w = 255;
return c;
}
uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b, float a)
{
uchar4 c;
c.x = (uchar)(r * 255.f);
c.y = (uchar)(g * 255.f);
c.z = (uchar)(b * 255.f);
c.w = (uchar)(a * 255.f);
return c;
}
/*
static uchar4 __attribute__((overloadable)) rsPackColorTo8888(float3 color)
{
color *= 255.f;
uchar4 c = {color.x, color.y, color.z, 255};
return c;
}
static uchar4 __attribute__((overloadable)) rsPackColorTo8888(float4 color)
{
color *= 255.f;
uchar4 c = {color.x, color.y, color.z, color.w};
return c;
}
static float4 rsUnpackColor8888(uchar4 c)
{
float4 ret = {
c.x * (1.f / 255.f),
c.y * (1.f / 255.f),
c.z * (1.f / 255.f),
c.w * (1.f / 255.f),
};
return ret;
}
extern uchar4 __attribute__((overloadable)) rsPackColorTo565(float r, float g, float b);
extern uchar4 __attribute__((overloadable)) rsPackColorTo565(float3);
extern float4 rsUnpackColor565(uchar4);
*/
#endif

14
libs/rs/scriptc/rs_math.rsh
View File

@@ -1,4 +1,6 @@
#include "rs_cl.rsh"
#include "rs_core.rsh"
// Allocations
@@ -11,18 +13,6 @@ extern uint32_t rsAllocationGetDimFaces(rs_allocation);
// Color conversion
extern uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b);
extern uchar4 __attribute__((overloadable)) rsPackColorTo8888(float r, float g, float b, float a);
extern uchar4 __attribute__((overloadable)) rsPackColorTo8888(float3);
extern uchar4 __attribute__((overloadable)) rsPackColorTo8888(float4);
extern float4 rsUnpackColor8888(uchar4);
extern uchar4 __attribute__((overloadable)) rsPackColorTo565(float r, float g, float b);
extern uchar4 __attribute__((overloadable)) rsPackColorTo565(float3);
extern float4 rsUnpackColor565(uchar4);
// Debugging
extern void __attribute__((overloadable))rsDebug(const char *, float);
extern void __attribute__((overloadable))rsDebug(const char *, float2);

26
libs/rs/scriptc/rs_types.rsh
View File

@@ -68,32 +68,6 @@ typedef int int8 __attribute__((ext_vector_type(8)));
typedef int int16 __attribute__((ext_vector_type(16)));
// RS_KIND_POSITION
typedef float rs_position1;
typedef float2 rs_position2;
typedef float3 rs_position3;
typedef float4 rs_position4;
// RS_KIND_COLOR
typedef float3 rs_color3f;
typedef float4 rs_color4f;
typedef uchar4 rs_color4u;
// RS_KIND_NORMAL
typedef float3 rs_normal;
// RS_KIND_POINT_SIZE
typedef float rs_point_size;
// RS_KIND_TEXTURE
typedef float rs_texture_coord1;
typedef float2 rs_texture_coord2;
typedef float3 rs_texture_coord3;
typedef float4 rs_texture_coord4;
// RS_KIND_INDEX
typedef ushort rs_index;
typedef struct {
float m[16];
} rs_matrix4x4;