Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3db34e5 authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "Remove float8/16 from RS type list. We will not have time to work... 

Merge "Remove float8/16 from RS type list. We will not have time to work through ABI issues for these types on arm for our ship date.  Can be re-added later."
parents dfda2adc 96d719c9

libs/rs/rsUtils.h

+0 −12
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ namespace renderscript { 


typedef float rsvF_2 __attribute__ ((vector_size (8)));

typedef float rsvF_4 __attribute__ ((vector_size (16)));

typedef float rsvF_8 __attribute__ ((vector_size (32)));

typedef float rsvF_16 __attribute__ ((vector_size (64)));

typedef uint8_t rsvU8_4 __attribute__ ((vector_size (4)));



union float2 {
@@ -64,16 +62,6 @@ union float4 { 
    float f[4];

};



union float8 {

    rsvF_8 v;

    float f[8];

};



union float16 {

    rsvF_16 v;

    float f[16];

};



union uchar4 {

    rsvU8_4 v;

    uint8_t f[4];

libs/rs/scriptc/rs_cl.rsh

+635 −470

File changed.

Preview size limit exceeded, changes collapsed.

libs/rs/scriptc/rs_core.rsh

+2 −6
Original line number Diff line number Diff line
@@ -38,12 +38,8 @@ static uchar4 __attribute__((overloadable)) rsPackColorTo8888(float4 color) 


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),

    };

    float4 ret = (float4)0.0039156862745f;

    ret *= convert_float4(c);

    return ret;

}

libs/rs/scriptc/rs_graphics.rsh

+4 −1
Original line number Diff line number Diff line 
#ifndef __RS_GRAPHICS_RSH__

#define __RS_GRAPHICS_RSH__



#include "rs_math.rsh"
@@ -41,5 +44,5 @@ extern void hsb(float, float, float, float); 
extern void hsbToRgb(float, float, float, float*);

extern int hsbToAbgr(float, float, float, float);





#endif

libs/rs/scriptc/rs_types.rsh

+0 −14
Original line number Diff line number Diff line
@@ -28,44 +28,30 @@ typedef int rs_program_store; 
typedef float float2 __attribute__((ext_vector_type(2)));

typedef float float3 __attribute__((ext_vector_type(3)));

typedef float float4 __attribute__((ext_vector_type(4)));

typedef float float8 __attribute__((ext_vector_type(8)));

typedef float float16 __attribute__((ext_vector_type(16)));



typedef uchar uchar2 __attribute__((ext_vector_type(2)));

typedef uchar uchar3 __attribute__((ext_vector_type(3)));

typedef uchar uchar4 __attribute__((ext_vector_type(4)));

typedef uchar uchar8 __attribute__((ext_vector_type(8)));

typedef uchar uchar16 __attribute__((ext_vector_type(16)));



typedef ushort ushort2 __attribute__((ext_vector_type(2)));

typedef ushort ushort3 __attribute__((ext_vector_type(3)));

typedef ushort ushort4 __attribute__((ext_vector_type(4)));

typedef ushort ushort8 __attribute__((ext_vector_type(8)));

typedef ushort ushort16 __attribute__((ext_vector_type(16)));



typedef uint uint2 __attribute__((ext_vector_type(2)));

typedef uint uint3 __attribute__((ext_vector_type(3)));

typedef uint uint4 __attribute__((ext_vector_type(4)));

typedef uint uint8 __attribute__((ext_vector_type(8)));

typedef uint uint16 __attribute__((ext_vector_type(16)));



typedef char char2 __attribute__((ext_vector_type(2)));

typedef char char3 __attribute__((ext_vector_type(3)));

typedef char char4 __attribute__((ext_vector_type(4)));

typedef char char8 __attribute__((ext_vector_type(8)));

typedef char char16 __attribute__((ext_vector_type(16)));



typedef short short2 __attribute__((ext_vector_type(2)));

typedef short short3 __attribute__((ext_vector_type(3)));

typedef short short4 __attribute__((ext_vector_type(4)));

typedef short short8 __attribute__((ext_vector_type(8)));

typedef short short16 __attribute__((ext_vector_type(16)));



typedef int int2 __attribute__((ext_vector_type(2)));

typedef int int3 __attribute__((ext_vector_type(3)));

typedef int int4 __attribute__((ext_vector_type(4)));

typedef int int8 __attribute__((ext_vector_type(8)));

typedef int int16 __attribute__((ext_vector_type(16)));





typedef struct {