diff options
| author | Pablo Ceballos <pceballos@google.com> | 2015-10-27 17:57:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-27 17:57:28 +0000 |
| commit | dce45fd66b403ab861dad5f27535785d87fa3028 (patch) | |
| tree | 224c4bdd4047db48f7688d5a0ac59e8831122485 /opengl | |
| parent | 6a6644c739f6f0aec2955b2ebb75a310d9aa167d (diff) | |
| parent | 3cdc93c6b48e751eeceb844e682f6d852dabf364 (diff) | |
Merge "Add missing OpenGLES 3.1 bitfield constants."
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/java/android/opengl/GLES31.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/opengl/java/android/opengl/GLES31.java b/opengl/java/android/opengl/GLES31.java index 3cbaa6079bf8..805930e343f2 100644 --- a/opengl/java/android/opengl/GLES31.java +++ b/opengl/java/android/opengl/GLES31.java @@ -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; |