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

Commit 43c2718b authored by Jesse Hall's avatar Jesse Hall Committed by Android (Google) Code Review
Browse files

Merge "Add EGL_KHR_get_all_proc_addresses to extension string"

parents ff866e76 21558daf

opengl/libs/EGL/eglApi.cpp

+15 −8
Original line number Original line Diff line number Diff line
@@ -59,16 +59,24 @@ struct extention_map_t { 
};

};





/*

/*

 * This is the list of EGL extensions exposed to applications,

 * This is the list of EGL extensions exposed to applications.

 * some of them are mandatory because used by the ANDROID system.

 *

 *

 * Mandatory extensions are required per the CDD and not explicitly

 * Some of them (gBuiltinExtensionString) are implemented entirely in this EGL

 * checked during EGL initialization. the system *assumes* these extensions

 * wrapper and are always available.

 * are present. the system may not function properly if some mandatory

 * extensions are missing.

 *

 *

 * NOTE: gExtensionString MUST have a single space as the last character.

 * The rest (gExtensionString) depend on support in the EGL driver, and are

 * only available if the driver supports them. However, some of these must be

 * supported because they are used by the Android system itself; these are

 * listd as mandatory below and are required by the CDD. The system *assumes*

 * the mandatory extensions are present and may not function properly if some

 * are missing.

 *

 * NOTE: Both strings MUST have a single space as the last character.

 */

 */

extern char const * const gBuiltinExtensionString =

        "EGL_KHR_get_all_proc_addresses "

        "EGL_ANDROID_presentation_time "

        ;

extern char const * const gExtensionString  =

extern char const * const gExtensionString  =

        "EGL_KHR_image "                        // mandatory

        "EGL_KHR_image "                        // mandatory

        "EGL_KHR_image_base "                   // mandatory

        "EGL_KHR_image_base "                   // mandatory
@@ -84,7 +92,6 @@ extern char const * const gExtensionString = 
        "EGL_NV_system_time "

        "EGL_NV_system_time "

        "EGL_ANDROID_image_native_buffer "      // mandatory

        "EGL_ANDROID_image_native_buffer "      // mandatory

        "EGL_KHR_wait_sync "                    // strongly recommended

        "EGL_KHR_wait_sync "                    // strongly recommended

        "EGL_ANDROID_presentation_time "

        ;

        ;





// extensions not exposed to applications but used by the ANDROID system

// extensions not exposed to applications but used by the ANDROID system

opengl/libs/EGL/egl_display.cpp

+11 −10
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ static char const * const sVendorString = "Android"; 
static char const * const sVersionString    = "1.4 Android META-EGL";

static char const * const sVersionString    = "1.4 Android META-EGL";

static char const * const sClientApiString  = "OpenGL_ES";

static char const * const sClientApiString  = "OpenGL_ES";





extern char const * const gBuiltinExtensionString;

extern char const * const gExtensionString;

extern char const * const gExtensionString;





extern void initEglTraceLevel();

extern void initEglTraceLevel();
@@ -183,7 +184,7 @@ EGLBoolean egl_display_t::initialize(EGLint *major, EGLint *minor) { 
    mVersionString.setTo(sVersionString);

    mVersionString.setTo(sVersionString);

    mClientApiString.setTo(sClientApiString);

    mClientApiString.setTo(sClientApiString);





    // we only add extensions that exist in the implementation

    mExtensionString.setTo(gBuiltinExtensionString);

    char const* start = gExtensionString;

    char const* start = gExtensionString;

    char const* end;

    char const* end;

    do {

    do {