summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Krzysztof KosiƄski <krzysio@google.com> 2018-04-11 22:49:30 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-04-11 22:49:30 +0000
commitf0747473495c6d72cdad96baf04f5c0807daf32b (patch)
tree0ae5571b8430cceede43e825394e4ebed645680c
parent03eebddfcaa45958d52ea18175ae833b0608f738 (diff)
parent5e7d9d5d9b8a66820be80cf7b6b1b1b3610ba782 (diff)
Merge "Remove temporary hack from gl2ext.h header." into pi-dev
-rw-r--r--opengl/include/GLES2/gl2ext.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/opengl/include/GLES2/gl2ext.h b/opengl/include/GLES2/gl2ext.h
index 3ad39d967b..e8d7515944 100644
--- a/opengl/include/GLES2/gl2ext.h
+++ b/opengl/include/GLES2/gl2ext.h
@@ -3612,17 +3612,6 @@ GL_APICALL void GL_APIENTRY glEndTilingQCOM (GLbitfield preserveMask);
#define GL_SHADER_BINARY_VIV 0x8FC4
#endif /* GL_VIV_shader_binary */
-/* Temporary hack to allow frameworks/base/libs/hwui/debug to build.
- * This function was removed from the Khronos version of the headers
- * (it is specified with the EXT prefix, not OES). */
-#ifndef GL_ANDROID_draw_elements_base_vertex_backwards_compatibility
-#define GL_ANDROID_draw_elements_base_vertex_backwards_compatibility 1
-typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXOESPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glMultiDrawElementsBaseVertexOES (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
-#endif
-#endif /* GL_ANDROID_draw_elements_base_vertex_backwards_compatibility */
-
#ifdef __cplusplus
}
#endif