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

Commit 3a291413 authored by Stephen Hines's avatar Stephen Hines
Browse files

Add missing support for Element.FONT(). 

Change-Id: Id66676958cc41d934b7f01acd65916f6d777d355
parent 7e6ee74a

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -18089,6 +18089,7 @@ package android.renderscript { 
    method public static android.renderscript.Element F64_2(android.renderscript.RenderScript);

    method public static android.renderscript.Element F64_3(android.renderscript.RenderScript);

    method public static android.renderscript.Element F64_4(android.renderscript.RenderScript);

    method public static android.renderscript.Element FONT(android.renderscript.RenderScript);

    method public static android.renderscript.Element I16(android.renderscript.RenderScript);

    method public static android.renderscript.Element I16_2(android.renderscript.RenderScript);

    method public static android.renderscript.Element I16_3(android.renderscript.RenderScript);
@@ -18174,6 +18175,7 @@ package android.renderscript { 
    enum_constant public static final android.renderscript.Element.DataType MATRIX_4X4;

    enum_constant public static final android.renderscript.Element.DataType RS_ALLOCATION;

    enum_constant public static final android.renderscript.Element.DataType RS_ELEMENT;

    enum_constant public static final android.renderscript.Element.DataType RS_FONT;

    enum_constant public static final android.renderscript.Element.DataType RS_MESH;

    enum_constant public static final android.renderscript.Element.DataType RS_PROGRAM_FRAGMENT;

    enum_constant public static final android.renderscript.Element.DataType RS_PROGRAM_RASTER;

graphics/java/android/renderscript/Element.java

+9 −1
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ public class Element extends BaseObj { 
        RS_PROGRAM_FRAGMENT (1006, 4),

        RS_PROGRAM_VERTEX (1007, 4),

        RS_PROGRAM_RASTER (1008, 4),

        RS_PROGRAM_STORE (1009, 4);

        RS_PROGRAM_STORE (1009, 4),

        RS_FONT (1010, 4);



        int mID;

        int mSize;
@@ -455,6 +456,13 @@ public class Element extends BaseObj { 
        return rs.mElement_PROGRAM_STORE;

    }



    public static Element FONT(RenderScript rs) {

        if(rs.mElement_FONT == null) {

            rs.mElement_FONT = createUser(rs, DataType.RS_FONT);

        }

        return rs.mElement_FONT;

    }





    public static Element A_8(RenderScript rs) {

        if(rs.mElement_A_8 == null) {

graphics/java/android/renderscript/RenderScript.java

+1 −0
Original line number Diff line number Diff line
@@ -664,6 +664,7 @@ public class RenderScript { 
    Element mElement_PROGRAM_VERTEX;

    Element mElement_PROGRAM_RASTER;

    Element mElement_PROGRAM_STORE;

    Element mElement_FONT;



    Element mElement_A_8;

    Element mElement_RGB_565;