From 4c035706dc3213d835dbd592655db14732296067 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 26 Mar 2014 13:11:29 -0700 Subject: [PATCH] mapi_abi: Remove ABI-check work arounds for functions that are no longer exported The previous commit stopped exporting 21 libGLESv2 and 88 libGLESv1_CM functions. This removes the work-arounds for those functions from ABI-check. Signed-off-by: Ian Romanick Reviewed-by: Matt Turner Acked-by: Chad Versace --- src/mapi/es1api/ABI-check | 93 +-------------------------------------- src/mapi/es2api/ABI-check | 28 ------------ 2 files changed, 2 insertions(+), 119 deletions(-) diff --git a/src/mapi/es1api/ABI-check b/src/mapi/es1api/ABI-check index 0e31f43324f..aecad5a6f5b 100755 --- a/src/mapi/es1api/ABI-check +++ b/src/mapi/es1api/ABI-check @@ -2,9 +2,8 @@ # Print defined gl.* functions not in GL ES 1.1 or in # (FIXME, none of these should be part of the ABI) -# GL_EXT_discard_framebuffer -# GL_OES_fixed_point -# GL_OES_single_precision +# GL_EXT_multi_draw_arrays +# GL_OES_EGL_image # or in extensions that are part of the ES 1.1 extension pack. # (see http://www.khronos.org/registry/gles/specs/1.1/opengles_spec_1_1_extension_pack.pdf) @@ -14,36 +13,23 @@ FUNCS=$(nm -D --defined-only ${1-.libs/libGLESv1_CM.so.1} | grep -o 'T gl.*' | c glActiveTexture glAlphaFunc glAlphaFuncx -glAlphaFuncxOES glBindBuffer -glBindFramebufferOES -glBindRenderbufferOES glBindTexture -glBlendEquationOES -glBlendEquationSeparateOES glBlendFunc -glBlendFuncSeparateOES glBufferData glBufferSubData -glCheckFramebufferStatusOES glClear glClearColor glClearColorx -glClearColorxOES glClearDepthf -glClearDepthfOES glClearDepthx -glClearDepthxOES glClearStencil glClientActiveTexture glClipPlanef -glClipPlanefOES glClipPlanex -glClipPlanexOES glColor4f glColor4ub glColor4x -glColor4xOES glColorMask glColorPointer glCompressedTexImage2D @@ -52,165 +38,102 @@ glCopyTexImage2D glCopyTexSubImage2D glCullFace glDeleteBuffers -glDeleteFramebuffersOES -glDeleteRenderbuffersOES glDeleteTextures glDepthFunc glDepthMask glDepthRangef -glDepthRangefOES glDepthRangex -glDepthRangexOES glDisable glDisableClientState -glDiscardFramebufferEXT glDrawArrays glDrawElements -glDrawTexfOES -glDrawTexfvOES -glDrawTexiOES -glDrawTexivOES -glDrawTexsOES -glDrawTexsvOES -glDrawTexxOES -glDrawTexxvOES glEGLImageTargetRenderbufferStorageOES glEGLImageTargetTexture2DOES glEnable glEnableClientState glFinish glFlush -glFlushMappedBufferRangeEXT glFogf glFogfv glFogx -glFogxOES glFogxv -glFogxvOES -glFramebufferRenderbufferOES -glFramebufferTexture2DOES glFrontFace glFrustumf -glFrustumfOES glFrustumx -glFrustumxOES glGenBuffers -glGenerateMipmapOES -glGenFramebuffersOES -glGenRenderbuffersOES glGenTextures glGetBooleanv glGetBufferParameteriv -glGetBufferPointervOES glGetClipPlanef -glGetClipPlanefOES glGetClipPlanex -glGetClipPlanexOES glGetError glGetFixedv -glGetFixedvOES glGetFloatv -glGetFramebufferAttachmentParameterivOES glGetIntegerv glGetLightfv glGetLightxv -glGetLightxvOES glGetMaterialfv glGetMaterialxv -glGetMaterialxvOES glGetPointerv -glGetRenderbufferParameterivOES glGetString glGetTexEnvfv glGetTexEnviv glGetTexEnvxv -glGetTexEnvxvOES -glGetTexGenfvOES -glGetTexGenivOES -glGetTexGenxvOES glGetTexParameterfv glGetTexParameteriv glGetTexParameterxv -glGetTexParameterxvOES glHint glIsBuffer glIsEnabled -glIsFramebufferOES -glIsRenderbufferOES glIsTexture glLightf glLightfv glLightModelf glLightModelfv glLightModelx -glLightModelxOES glLightModelxv -glLightModelxvOES glLightx -glLightxOES glLightxv -glLightxvOES glLineWidth glLineWidthx -glLineWidthxOES glLoadIdentity glLoadMatrixf glLoadMatrixx -glLoadMatrixxOES glLogicOp -glMapBufferOES -glMapBufferRangeEXT glMaterialf glMaterialfv glMaterialx -glMaterialxOES glMaterialxv -glMaterialxvOES glMatrixMode glMultiDrawArraysEXT glMultiDrawElementsEXT glMultiTexCoord4f glMultiTexCoord4x -glMultiTexCoord4xOES glMultMatrixf glMultMatrixx -glMultMatrixxOES glNormal3f glNormal3x -glNormal3xOES glNormalPointer glOrthof -glOrthofOES glOrthox -glOrthoxOES glPixelStorei glPointParameterf glPointParameterfv glPointParameterx -glPointParameterxOES glPointParameterxv -glPointParameterxvOES glPointSize -glPointSizePointerOES glPointSizex -glPointSizexOES glPolygonOffset glPolygonOffsetx -glPolygonOffsetxOES glPopMatrix glPushMatrix -glQueryMatrixxOES glReadPixels -glRenderbufferStorageOES glRotatef glRotatex -glRotatexOES glSampleCoverage glSampleCoveragex -glSampleCoveragexOES glScalef glScalex -glScalexOES glScissor glShadeModel glStencilFunc @@ -222,29 +145,17 @@ glTexEnvfv glTexEnvi glTexEnviv glTexEnvx -glTexEnvxOES glTexEnvxv -glTexEnvxvOES -glTexGenfOES -glTexGenfvOES -glTexGeniOES -glTexGenivOES -glTexGenxOES -glTexGenxvOES glTexImage2D glTexParameterf glTexParameterfv glTexParameteri glTexParameteriv glTexParameterx -glTexParameterxOES glTexParameterxv -glTexParameterxvOES glTexSubImage2D glTranslatef glTranslatex -glTranslatexOES -glUnmapBufferOES glVertexPointer glViewport EOF diff --git a/src/mapi/es2api/ABI-check b/src/mapi/es2api/ABI-check index 4a61050059b..abbb55c2232 100755 --- a/src/mapi/es2api/ABI-check +++ b/src/mapi/es2api/ABI-check @@ -2,16 +2,8 @@ # Print defined gl.* functions not in GL ES 3.0 or in # (FIXME, none of these should be part of the ABI) -# GL_EXT_discard_framebuffer -# GL_EXT_map_buffer_range # GL_EXT_multi_draw_arrays -# GL_NV_draw_buffers -# GL_NV_read_buffer # GL_OES_EGL_image -# GL_OES_get_program_binary -# GL_OES_mapbuffer -# GL_OES_texture_3D -# GL_OES_vertex_array_object FUNCS=$(nm -D --defined-only ${1-.libs/libGLESv2.so.2} | grep -o 'T gl.*' | cut -c 3- | while read func; do ( grep -q "^$func$" || echo $func ) <