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

Commit dce45fd6 authored by Pablo Ceballos's avatar Pablo Ceballos Committed by Android (Google) Code Review
Browse files

Merge "Add missing OpenGLES 3.1 bitfield constants."

parents 6a6644c7 3cdc93c6

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -22153,6 +22153,7 @@ package android.opengl { 
    field public static final int GL_ACTIVE_PROGRAM = 33369; // 0x8259

    field public static final int GL_ACTIVE_RESOURCES = 37621; // 0x92f5

    field public static final int GL_ACTIVE_VARIABLES = 37637; // 0x9305

    field public static final int GL_ALL_BARRIER_BITS = -1; // 0xffffffff

    field public static final int GL_ALL_SHADER_BITS = -1; // 0xffffffff

    field public static final int GL_ARRAY_SIZE = 37627; // 0x92fb

    field public static final int GL_ARRAY_STRIDE = 37630; // 0x92fe
@@ -22176,6 +22177,7 @@ package android.opengl { 
    field public static final int GL_DISPATCH_INDIRECT_BUFFER_BINDING = 37103; // 0x90ef

    field public static final int GL_DRAW_INDIRECT_BUFFER = 36671; // 0x8f3f

    field public static final int GL_DRAW_INDIRECT_BUFFER_BINDING = 36675; // 0x8f43

    field public static final int GL_ELEMENT_ARRAY_BARRIER_BIT = 2; // 0x2

    field public static final int GL_FRAGMENT_SHADER_BIT = 2; // 0x2

    field public static final int GL_FRAMEBUFFER_BARRIER_BIT = 1024; // 0x400

    field public static final int GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS = 37652; // 0x9314
@@ -22265,6 +22267,7 @@ package android.opengl { 
    field public static final int GL_SAMPLE_MASK = 36433; // 0x8e51

    field public static final int GL_SAMPLE_MASK_VALUE = 36434; // 0x8e52

    field public static final int GL_SAMPLE_POSITION = 36432; // 0x8e50

    field public static final int GL_SHADER_IMAGE_ACCESS_BARRIER_BIT = 32; // 0x20

    field public static final int GL_SHADER_STORAGE_BARRIER_BIT = 8192; // 0x2000

    field public static final int GL_SHADER_STORAGE_BLOCK = 37606; // 0x92e6

    field public static final int GL_SHADER_STORAGE_BUFFER = 37074; // 0x90d2
@@ -22310,6 +22313,7 @@ package android.opengl { 
    field public static final int GL_UNSIGNED_INT_IMAGE_3D = 36964; // 0x9064

    field public static final int GL_UNSIGNED_INT_IMAGE_CUBE = 36966; // 0x9066

    field public static final int GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE = 37130; // 0x910a

    field public static final int GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT = 1; // 0x1

    field public static final int GL_VERTEX_ATTRIB_BINDING = 33492; // 0x82d4

    field public static final int GL_VERTEX_ATTRIB_RELATIVE_OFFSET = 33493; // 0x82d5

    field public static final int GL_VERTEX_BINDING_BUFFER = 36687; // 0x8f4f

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -24098,6 +24098,7 @@ package android.opengl { 
    field public static final int GL_ACTIVE_PROGRAM = 33369; // 0x8259

    field public static final int GL_ACTIVE_RESOURCES = 37621; // 0x92f5

    field public static final int GL_ACTIVE_VARIABLES = 37637; // 0x9305

    field public static final int GL_ALL_BARRIER_BITS = -1; // 0xffffffff

    field public static final int GL_ALL_SHADER_BITS = -1; // 0xffffffff

    field public static final int GL_ARRAY_SIZE = 37627; // 0x92fb

    field public static final int GL_ARRAY_STRIDE = 37630; // 0x92fe
@@ -24121,6 +24122,7 @@ package android.opengl { 
    field public static final int GL_DISPATCH_INDIRECT_BUFFER_BINDING = 37103; // 0x90ef

    field public static final int GL_DRAW_INDIRECT_BUFFER = 36671; // 0x8f3f

    field public static final int GL_DRAW_INDIRECT_BUFFER_BINDING = 36675; // 0x8f43

    field public static final int GL_ELEMENT_ARRAY_BARRIER_BIT = 2; // 0x2

    field public static final int GL_FRAGMENT_SHADER_BIT = 2; // 0x2

    field public static final int GL_FRAMEBUFFER_BARRIER_BIT = 1024; // 0x400

    field public static final int GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS = 37652; // 0x9314
@@ -24210,6 +24212,7 @@ package android.opengl { 
    field public static final int GL_SAMPLE_MASK = 36433; // 0x8e51

    field public static final int GL_SAMPLE_MASK_VALUE = 36434; // 0x8e52

    field public static final int GL_SAMPLE_POSITION = 36432; // 0x8e50

    field public static final int GL_SHADER_IMAGE_ACCESS_BARRIER_BIT = 32; // 0x20

    field public static final int GL_SHADER_STORAGE_BARRIER_BIT = 8192; // 0x2000

    field public static final int GL_SHADER_STORAGE_BLOCK = 37606; // 0x92e6

    field public static final int GL_SHADER_STORAGE_BUFFER = 37074; // 0x90d2
@@ -24255,6 +24258,7 @@ package android.opengl { 
    field public static final int GL_UNSIGNED_INT_IMAGE_3D = 36964; // 0x9064

    field public static final int GL_UNSIGNED_INT_IMAGE_CUBE = 36966; // 0x9066

    field public static final int GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE = 37130; // 0x910a

    field public static final int GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT = 1; // 0x1

    field public static final int GL_VERTEX_ATTRIB_BINDING = 33492; // 0x82d4

    field public static final int GL_VERTEX_ATTRIB_RELATIVE_OFFSET = 33493; // 0x82d5

    field public static final int GL_VERTEX_BINDING_BUFFER = 36687; // 0x8f4f

opengl/java/android/opengl/GLES31.java

+8 −2
Original line number Diff line number Diff line
@@ -24,9 +24,14 @@ public class GLES31 extends GLES30 { 


    public static final int GL_VERTEX_SHADER_BIT                            = 0x00000001;

    public static final int GL_FRAGMENT_SHADER_BIT                          = 0x00000002;

    public static final int GL_COMPUTE_SHADER_BIT                           = 0x00000020;

    public static final int GL_ALL_SHADER_BITS                              = -1; // 0xFFFFFFFF



    public static final int GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT              = 0x00000001;

    public static final int GL_ELEMENT_ARRAY_BARRIER_BIT                    = 0x00000002;

    public static final int GL_UNIFORM_BARRIER_BIT                          = 0x00000004;

    public static final int GL_TEXTURE_FETCH_BARRIER_BIT                    = 0x00000008;

    public static final int GL_COMPUTE_SHADER_BIT                           = 0x00000020;

    public static final int GL_SHADER_IMAGE_ACCESS_BARRIER_BIT              = 0x00000020;

    public static final int GL_COMMAND_BARRIER_BIT                          = 0x00000040;

    public static final int GL_PIXEL_BUFFER_BARRIER_BIT                     = 0x00000080;

    public static final int GL_TEXTURE_UPDATE_BARRIER_BIT                   = 0x00000100;
@@ -35,7 +40,8 @@ public class GLES31 extends GLES30 { 
    public static final int GL_TRANSFORM_FEEDBACK_BARRIER_BIT               = 0x00000800;

    public static final int GL_ATOMIC_COUNTER_BARRIER_BIT                   = 0x00001000;

    public static final int GL_SHADER_STORAGE_BARRIER_BIT                   = 0x00002000;

    public static final int GL_ALL_SHADER_BITS                              = -1; // 0xFFFFFFFF

    public static final int GL_ALL_BARRIER_BITS                             = -1; // 0xFFFFFFFF





    public static final int GL_TEXTURE_WIDTH                                = 0x1000;

    public static final int GL_TEXTURE_HEIGHT                               = 0x1001;