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

Commit e537c8e7 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 529 into donut 

* changes:
  use gl.h to generate the *.in files. we are now supporting the full gl.h and glext.h apis.
parents 6912c705 b519abb6

opengl/libs/EGL/egl.cpp

+1 −5
Original line number Original line Diff line number Diff line
@@ -143,6 +143,7 @@ static void gl_unimplemented() { 




static char const * const gl_names[] = {

static char const * const gl_names[] = {

    #include "gl_entries.in"

    #include "gl_entries.in"

    #include "glext_entries.in"

    NULL

    NULL

};

};
@@ -315,11 +316,6 @@ void *load_driver(const char* driver, gl_hooks_t* hooks) 
        api = gl_names;

        api = gl_names;

        while (*api) {

        while (*api) {

            char const * name = *api;

            char const * name = *api;

            // if the function starts with '__' it's a special case that

            // uses a wrapper. skip the '__' when looking into the real lib.

            if (name[0] == '_' && name[1] == '_') {

                name += 2;

            }

            __eglMustCastToProperFunctionPointerType f = 

            __eglMustCastToProperFunctionPointerType f = 

                (__eglMustCastToProperFunctionPointerType)dlsym(dso, name);

                (__eglMustCastToProperFunctionPointerType)dlsym(dso, name);

            if (f == NULL) {

            if (f == NULL) {

opengl/libs/GLES_CM/gl.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -101,6 +101,7 @@ void glVertexPointerBounds(GLint size, GLenum type, 




extern "C" {

extern "C" {

#include "gl_api.in"

#include "gl_api.in"

#include "glext_api.in"

}

}





#undef API_ENTRY

#undef API_ENTRY
@@ -109,8 +110,8 @@ extern "C" { 








/*

/*

 * These GL calls are special because they need to EGL to retrieve some

 * These GL calls are special because they need to call into EGL to retrieve

 * informations before they can execute.

 * some informations before they can execute.

 */

 */