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

Commit 900da7b1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I6a2f4df7,I62e108bd,Icd83a5ef 

* changes:
  Migrate libGLESv3 to ndk_library.
  Migrate libGLESv2 to ndk_library.
  Migrate libGLESv1_CM to ndk_library.
parents 87e72cb2 d7d8efa4

opengl/Android.bp

+21 −0
Original line number Diff line number Diff line
@@ -19,6 +19,27 @@ ndk_headers { 
    srcs: ["include/EGL/**/*.h"],

}



ndk_headers {

    name: "libGLESv1_CM_headers",

    from: "include",

    to: "",

    srcs: ["include/GLES/**/*.h"],

}



ndk_headers {

    name: "libGLESv2_headers",

    from: "include",

    to: "",

    srcs: ["include/GLES2/**/*.h"],

}



ndk_headers {

    name: "libGLESv3_headers",

    from: "include",

    to: "",

    srcs: ["include/GLES3/**/*.h"],

}



subdirs = [

    "*",

]

opengl/libs/Android.bp

+19 −1
Original line number Diff line number Diff line
@@ -21,9 +21,27 @@ cc_library { 
    },

}



// The headers module is in frameworks/native/opengl/Android.bp.

// The headers modules are in frameworks/native/opengl/Android.bp.

ndk_library {

    name: "libEGL.ndk",

    symbol_file: "libEGL.map.txt",

    first_version: "9",

}



ndk_library {

    name: "libGLESv1_CM.ndk",

    symbol_file: "libGLESv1_CM.map.txt",

    first_version: "9",

}



ndk_library {

    name: "libGLESv2.ndk",

    symbol_file: "libGLESv2.map.txt",

    first_version: "9",

}



ndk_library {

    name: "libGLESv3.ndk",

    symbol_file: "libGLESv3.map.txt",

    first_version: "18",

}

opengl/libs/libGLESv1_CM.map.txt

0 → 100644
+283 −0
Original line number Diff line number Diff line 
LIBGLESV1_CM {

  global:

    glActiveTexture;

    glAlphaFunc;

    glAlphaFuncx;

    glAlphaFuncxOES;

    glBindBuffer;

    glBindFramebufferOES;

    glBindRenderbufferOES;

    glBindTexture;

    glBindVertexArrayOES; # introduced-mips=9 introduced-x86=9

    glBlendEquationOES;

    glBlendEquationSeparateOES;

    glBlendFunc;

    glBlendFuncSeparateOES;

    glBufferData;

    glBufferSubData;

    glCheckFramebufferStatusOES;

    glClear;

    glClearColor;

    glClearColorx;

    glClearColorxOES;

    glClearDepthf;

    glClearDepthfOES;

    glClearDepthx;

    glClearDepthxOES;

    glClearStencil;

    glClientActiveTexture;

    glClipPlanef;

    glClipPlanefIMG; # introduced-mips=9 introduced-x86=9

    glClipPlanefOES;

    glClipPlanex;

    glClipPlanexIMG; # introduced-mips=9 introduced-x86=9

    glClipPlanexOES;

    glColor4f;

    glColor4ub;

    glColor4x;

    glColor4xOES;

    glColorMask;

    glColorPointer;

    glColorPointerBounds;

    glCompressedTexImage2D;

    glCompressedTexSubImage2D;

    glCopyTexImage2D;

    glCopyTexSubImage2D;

    glCullFace;

    glCurrentPaletteMatrixOES;

    glDeleteBuffers;

    glDeleteFencesNV; # introduced-mips=9 introduced-x86=9

    glDeleteFramebuffersOES;

    glDeleteRenderbuffersOES;

    glDeleteTextures;

    glDeleteVertexArraysOES; # introduced-mips=9 introduced-x86=9

    glDepthFunc;

    glDepthMask;

    glDepthRangef;

    glDepthRangefOES;

    glDepthRangex;

    glDepthRangexOES;

    glDisable;

    glDisableClientState;

    glDisableDriverControlQCOM; # introduced-mips=9 introduced-x86=9

    glDiscardFramebufferEXT; # introduced-mips=9 introduced-x86=9

    glDrawArrays;

    glDrawElements;

    glDrawTexfOES;

    glDrawTexfvOES;

    glDrawTexiOES;

    glDrawTexivOES;

    glDrawTexsOES;

    glDrawTexsvOES;

    glDrawTexxOES;

    glDrawTexxvOES;

    glEGLImageTargetRenderbufferStorageOES;

    glEGLImageTargetTexture2DOES;

    glEnable;

    glEnableClientState;

    glEnableDriverControlQCOM; # introduced-mips=9 introduced-x86=9

    glEndTilingQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetBufferPointervQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetBuffersQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetFramebuffersQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetProgramBinarySourceQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetProgramsQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetRenderbuffersQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetShadersQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetTexLevelParameterivQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetTexSubImageQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetTexturesQCOM; # introduced-mips=9 introduced-x86=9

    glExtIsProgramBinaryQCOM; # introduced-mips=9 introduced-x86=9

    glExtTexObjectStateOverrideiQCOM; # introduced-mips=9 introduced-x86=9

    glFinish;

    glFinishFenceNV; # introduced-mips=9 introduced-x86=9

    glFlush;

    glFogf;

    glFogfv;

    glFogx;

    glFogxOES;

    glFogxv;

    glFogxvOES;

    glFramebufferRenderbufferOES;

    glFramebufferTexture2DMultisampleIMG; # introduced-mips=9 introduced-x86=9

    glFramebufferTexture2DOES;

    glFrontFace;

    glFrustumf;

    glFrustumfOES;

    glFrustumx;

    glFrustumxOES;

    glGenBuffers;

    glGenFencesNV; # introduced-mips=9 introduced-x86=9

    glGenFramebuffersOES;

    glGenRenderbuffersOES;

    glGenTextures;

    glGenVertexArraysOES; # introduced-mips=9 introduced-x86=9

    glGenerateMipmapOES;

    glGetBooleanv;

    glGetBufferParameteriv;

    glGetBufferPointervOES;

    glGetClipPlanef;

    glGetClipPlanefOES;

    glGetClipPlanex;

    glGetClipPlanexOES;

    glGetDriverControlStringQCOM; # introduced-mips=9 introduced-x86=9

    glGetDriverControlsQCOM; # introduced-mips=9 introduced-x86=9

    glGetError;

    glGetFenceivNV; # introduced-mips=9 introduced-x86=9

    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;

    glIsFenceNV; # introduced-mips=9 introduced-x86=9

    glIsFramebufferOES;

    glIsRenderbufferOES;

    glIsTexture;

    glIsVertexArrayOES; # introduced-mips=9 introduced-x86=9

    glLightModelf;

    glLightModelfv;

    glLightModelx;

    glLightModelxOES;

    glLightModelxv;

    glLightModelxvOES;

    glLightf;

    glLightfv;

    glLightx;

    glLightxOES;

    glLightxv;

    glLightxvOES;

    glLineWidth;

    glLineWidthx;

    glLineWidthxOES;

    glLoadIdentity;

    glLoadMatrixf;

    glLoadMatrixx;

    glLoadMatrixxOES;

    glLoadPaletteFromModelViewMatrixOES;

    glLogicOp;

    glMapBufferOES;

    glMaterialf;

    glMaterialfv;

    glMaterialx;

    glMaterialxOES;

    glMaterialxv;

    glMaterialxvOES;

    glMatrixIndexPointerOES;

    glMatrixIndexPointerOESBounds; # introduced-mips=9 introduced-x86=9

    glMatrixMode;

    glMultMatrixf;

    glMultMatrixx;

    glMultMatrixxOES;

    glMultiDrawArraysEXT; # introduced-mips=9 introduced-x86=9

    glMultiDrawElementsEXT; # introduced-mips=9 introduced-x86=9

    glMultiTexCoord4f;

    glMultiTexCoord4x;

    glMultiTexCoord4xOES;

    glNormal3f;

    glNormal3x;

    glNormal3xOES;

    glNormalPointer;

    glNormalPointerBounds;

    glOrthof;

    glOrthofOES;

    glOrthox;

    glOrthoxOES;

    glPixelStorei;

    glPointParameterf;

    glPointParameterfv;

    glPointParameterx;

    glPointParameterxOES;

    glPointParameterxv;

    glPointParameterxvOES;

    glPointSize;

    glPointSizePointerOES;

    glPointSizePointerOESBounds; # introduced-mips=9 introduced-x86=9

    glPointSizex;

    glPointSizexOES;

    glPolygonOffset;

    glPolygonOffsetx;

    glPolygonOffsetxOES;

    glPopMatrix;

    glPushMatrix;

    glQueryMatrixxOES;

    glReadPixels;

    glRenderbufferStorageMultisampleIMG; # introduced-mips=9 introduced-x86=9

    glRenderbufferStorageOES;

    glRotatef;

    glRotatex;

    glRotatexOES;

    glSampleCoverage;

    glSampleCoveragex;

    glSampleCoveragexOES;

    glScalef;

    glScalex;

    glScalexOES;

    glScissor;

    glSetFenceNV; # introduced-mips=9 introduced-x86=9

    glShadeModel;

    glStartTilingQCOM; # introduced-mips=9 introduced-x86=9

    glStencilFunc;

    glStencilMask;

    glStencilOp;

    glTestFenceNV; # introduced-mips=9 introduced-x86=9

    glTexCoordPointer;

    glTexCoordPointerBounds;

    glTexEnvf;

    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;

    glVertexPointerBounds;

    glViewport;

    glWeightPointerOES;

    glWeightPointerOESBounds; # introduced-mips=9 introduced-x86=9

  local:

    *;

};

opengl/libs/libGLESv2.map.txt

0 → 100644
+207 −0
Original line number Diff line number Diff line 
LIBGLESV2 {

  global:

    glActiveTexture;

    glAttachShader;

    glBeginPerfMonitorAMD;

    glBindAttribLocation;

    glBindBuffer;

    glBindFramebuffer;

    glBindRenderbuffer;

    glBindTexture;

    glBindVertexArrayOES; # introduced-mips=9 introduced-x86=9

    glBlendColor;

    glBlendEquation;

    glBlendEquationSeparate;

    glBlendFunc;

    glBlendFuncSeparate;

    glBufferData;

    glBufferSubData;

    glCheckFramebufferStatus;

    glClear;

    glClearColor;

    glClearDepthf;

    glClearStencil;

    glColorMask;

    glCompileShader;

    glCompressedTexImage2D;

    glCompressedTexImage3DOES;

    glCompressedTexSubImage2D;

    glCompressedTexSubImage3DOES;

    glCopyTexImage2D;

    glCopyTexSubImage2D;

    glCopyTexSubImage3DOES;

    glCoverageMaskNV; # introduced-mips=9 introduced-x86=9

    glCoverageOperationNV; # introduced-mips=9 introduced-x86=9

    glCreateProgram;

    glCreateShader;

    glCullFace;

    glDeleteBuffers;

    glDeleteFencesNV;

    glDeleteFramebuffers;

    glDeletePerfMonitorsAMD;

    glDeleteProgram;

    glDeleteRenderbuffers;

    glDeleteShader;

    glDeleteTextures;

    glDeleteVertexArraysOES; # introduced-mips=9 introduced-x86=9

    glDepthFunc;

    glDepthMask;

    glDepthRangef;

    glDetachShader;

    glDisable;

    glDisableDriverControlQCOM;

    glDisableVertexAttribArray;

    glDiscardFramebufferEXT; # introduced-mips=9 introduced-x86=9

    glDrawArrays;

    glDrawElements;

    glEGLImageTargetRenderbufferStorageOES;

    glEGLImageTargetTexture2DOES;

    glEnable;

    glEnableDriverControlQCOM;

    glEnableVertexAttribArray;

    glEndPerfMonitorAMD;

    glEndTilingQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetBufferPointervQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetBuffersQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetFramebuffersQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetProgramBinarySourceQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetProgramsQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetRenderbuffersQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetShadersQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetTexLevelParameterivQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetTexSubImageQCOM; # introduced-mips=9 introduced-x86=9

    glExtGetTexturesQCOM; # introduced-mips=9 introduced-x86=9

    glExtIsProgramBinaryQCOM; # introduced-mips=9 introduced-x86=9

    glExtTexObjectStateOverrideiQCOM; # introduced-mips=9 introduced-x86=9

    glFinish;

    glFinishFenceNV;

    glFlush;

    glFramebufferRenderbuffer;

    glFramebufferTexture2D;

    glFramebufferTexture2DMultisampleIMG; # introduced-mips=9 introduced-x86=9

    glFramebufferTexture3DOES;

    glFrontFace;

    glGenBuffers;

    glGenFencesNV;

    glGenFramebuffers;

    glGenPerfMonitorsAMD;

    glGenRenderbuffers;

    glGenTextures;

    glGenVertexArraysOES; # introduced-mips=9 introduced-x86=9

    glGenerateMipmap;

    glGetActiveAttrib;

    glGetActiveUniform;

    glGetAttachedShaders;

    glGetAttribLocation;

    glGetBooleanv;

    glGetBufferParameteriv;

    glGetBufferPointervOES;

    glGetDriverControlStringQCOM;

    glGetDriverControlsQCOM;

    glGetError;

    glGetFenceivNV;

    glGetFloatv;

    glGetFramebufferAttachmentParameteriv;

    glGetIntegerv;

    glGetPerfMonitorCounterDataAMD;

    glGetPerfMonitorCounterInfoAMD;

    glGetPerfMonitorCounterStringAMD;

    glGetPerfMonitorCountersAMD;

    glGetPerfMonitorGroupStringAMD;

    glGetPerfMonitorGroupsAMD;

    glGetProgramBinaryOES;

    glGetProgramInfoLog;

    glGetProgramiv;

    glGetRenderbufferParameteriv;

    glGetShaderInfoLog;

    glGetShaderPrecisionFormat;

    glGetShaderSource;

    glGetShaderiv;

    glGetString;

    glGetTexParameterfv;

    glGetTexParameteriv;

    glGetUniformLocation;

    glGetUniformfv;

    glGetUniformiv;

    glGetVertexAttribPointerv;

    glGetVertexAttribfv;

    glGetVertexAttribiv;

    glHint;

    glIsBuffer;

    glIsEnabled;

    glIsFenceNV;

    glIsFramebuffer;

    glIsProgram;

    glIsRenderbuffer;

    glIsShader;

    glIsTexture;

    glIsVertexArrayOES; # introduced-mips=9 introduced-x86=9

    glLineWidth;

    glLinkProgram;

    glMapBufferOES;

    glMultiDrawArraysEXT; # introduced-mips=9 introduced-x86=9

    glMultiDrawElementsEXT; # introduced-mips=9 introduced-x86=9

    glPixelStorei;

    glPolygonOffset;

    glProgramBinaryOES;

    glReadPixels;

    glReleaseShaderCompiler;

    glRenderbufferStorage;

    glRenderbufferStorageMultisampleIMG; # introduced-mips=9 introduced-x86=9

    glSampleCoverage;

    glScissor;

    glSelectPerfMonitorCountersAMD;

    glSetFenceNV;

    glShaderBinary;

    glShaderSource;

    glStartTilingQCOM; # introduced-mips=9 introduced-x86=9

    glStencilFunc;

    glStencilFuncSeparate;

    glStencilMask;

    glStencilMaskSeparate;

    glStencilOp;

    glStencilOpSeparate;

    glTestFenceNV;

    glTexImage2D;

    glTexImage3DOES;

    glTexParameterf;

    glTexParameterfv;

    glTexParameteri;

    glTexParameteriv;

    glTexSubImage2D;

    glTexSubImage3DOES;

    glUniform1f;

    glUniform1fv;

    glUniform1i;

    glUniform1iv;

    glUniform2f;

    glUniform2fv;

    glUniform2i;

    glUniform2iv;

    glUniform3f;

    glUniform3fv;

    glUniform3i;

    glUniform3iv;

    glUniform4f;

    glUniform4fv;

    glUniform4i;

    glUniform4iv;

    glUniformMatrix2fv;

    glUniformMatrix3fv;

    glUniformMatrix4fv;

    glUnmapBufferOES;

    glUseProgram;

    glValidateProgram;

    glVertexAttrib1f;

    glVertexAttrib1fv;

    glVertexAttrib2f;

    glVertexAttrib2fv;

    glVertexAttrib3f;

    glVertexAttrib3fv;

    glVertexAttrib4f;

    glVertexAttrib4fv;

    glVertexAttribPointer;

    glViewport;

  local:

    *;

};

opengl/libs/libGLESv3.map.txt

0 → 100644
+416 −0

File added.

Preview size limit exceeded, changes collapsed.