From fc968058bfcf9c6fb20cd0682de1f4dd93d588ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Sun, 1 Apr 2018 21:56:02 -0700 Subject: [PATCH] hwui/debug: Remove glMultiDrawElementsBaseVertexOES stubs. This function was included by mistake in Khronos OpenGL headers. See this link for further information: https://github.com/KhronosGroup/OpenGL-Registry/issues/81 Bug: 32147090 Bug: 66900669 Bug: 72959780 Test: Built and flashed the build onto Pixel XL, ran some CTS tests. Change-Id: If8f9837466b7d3eb0685624a70b5d5b6fbd86e2e --- libs/hwui/debug/gles_decls.in | 3 +-- libs/hwui/debug/gles_stubs.in | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libs/hwui/debug/gles_decls.in b/libs/hwui/debug/gles_decls.in index 16574a7fb0744..3900959c29de9 100644 --- a/libs/hwui/debug/gles_decls.in +++ b/libs/hwui/debug/gles_decls.in @@ -387,7 +387,6 @@ GL_ENTRY(GLboolean, glIsEnablediOES, GLenum target, GLuint index) GL_ENTRY(void, glDrawElementsBaseVertexOES, GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex) GL_ENTRY(void, glDrawRangeElementsBaseVertexOES, GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex) GL_ENTRY(void, glDrawElementsInstancedBaseVertexOES, GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex) -GL_ENTRY(void, glMultiDrawElementsBaseVertexOES, GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex) GL_ENTRY(void, glFramebufferTextureOES, GLenum target, GLenum attachment, GLuint texture, GLint level) GL_ENTRY(void, glGetProgramBinaryOES, GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary) GL_ENTRY(void, glProgramBinaryOES, GLuint program, GLenum binaryFormat, const void *binary, GLint length) @@ -541,4 +540,4 @@ GL_ENTRY(void, glTexStorage3DEXT, GLenum target, GLsizei levels, GLenum internal GL_ENTRY(void, glTextureStorage1DEXT, GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width) GL_ENTRY(void, glTextureStorage2DEXT, GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height) GL_ENTRY(void, glTextureStorage3DEXT, GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth) -GL_ENTRY(void, glTextureViewEXT, GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers) \ No newline at end of file +GL_ENTRY(void, glTextureViewEXT, GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers) diff --git a/libs/hwui/debug/gles_stubs.in b/libs/hwui/debug/gles_stubs.in index 4064a391a71df..7cba0c1158149 100644 --- a/libs/hwui/debug/gles_stubs.in +++ b/libs/hwui/debug/gles_stubs.in @@ -1165,9 +1165,6 @@ void API_ENTRY(glDrawRangeElementsBaseVertexOES)(GLenum mode, GLuint start, GLui void API_ENTRY(glDrawElementsInstancedBaseVertexOES)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex) { CALL_GL_API(glDrawElementsInstancedBaseVertexOES, mode, count, type, indices, instancecount, basevertex); } -void API_ENTRY(glMultiDrawElementsBaseVertexOES)(GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex) { - CALL_GL_API(glMultiDrawElementsBaseVertexOES, mode, count, type, indices, primcount, basevertex); -} void API_ENTRY(glFramebufferTextureOES)(GLenum target, GLenum attachment, GLuint texture, GLint level) { CALL_GL_API(glFramebufferTextureOES, target, attachment, texture, level); } @@ -1629,4 +1626,4 @@ void API_ENTRY(glTextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei lev } void API_ENTRY(glTextureViewEXT)(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers) { CALL_GL_API(glTextureViewEXT, texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers); -} \ No newline at end of file +}