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

Commit d41b8e6d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Expose extension for obtaining an EGLClientBuffer from an AHardwareBuffer"

parents 07c0b54a 60761078

opengl/include/EGL/eglext.h

+10 −0
Original line number Diff line number Diff line
@@ -619,6 +619,16 @@ typedef EGLClientBuffer (EGLAPIENTRYP PFNEGLCREATENATIVECLIENTBUFFERANDROID) (co 
#endif

#endif



#ifndef EGL_ANDROID_get_native_client_buffer

#define EGL_ANDROID_get_native_client_buffer 1

struct AHardwareBuffer;

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLClientBuffer eglGetNativeClientBufferANDROID (const AHardwareBuffer *buffer);

#else

typedef EGLClientBuffer (EGLAPIENTRYP PFNEGLGETNATIVECLIENTBUFFERANDROID) (const AHardwareBuffer *buffer);

#endif

#endif



#ifndef EGL_ANDROID_front_buffer_auto_refresh

#define EGL_ANDROID_front_buffer_auto_refresh 1

#define EGL_FRONT_BUFFER_AUTO_REFRESH_ANDROID 0x314C

opengl/libs/EGL/eglApi.cpp

+18 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <EGL/egl.h>

#include <EGL/eglext.h>



#include <android/hardware_buffer.h>

#include <cutils/atomic.h>

#include <cutils/compiler.h>

#include <cutils/memory.h>
@@ -85,6 +86,7 @@ extern char const * const gBuiltinExtensionString = 
        "EGL_ANDROID_presentation_time "

        "EGL_KHR_swap_buffers_with_damage "

        "EGL_ANDROID_create_native_client_buffer "

        "EGL_ANDROID_get_native_client_buffer "

        "EGL_ANDROID_front_buffer_auto_refresh "

        "EGL_ANDROID_get_frame_timestamps "

        ;
@@ -178,10 +180,14 @@ static const extention_map_t sExtensionMap[] = { 
    { "eglSwapBuffersWithDamageKHR",

            (__eglMustCastToProperFunctionPointerType)&eglSwapBuffersWithDamageKHR },



    // EGL_ANDROID_native_client_buffer

    // EGL_ANDROID_create_native_client_buffer

    { "eglCreateNativeClientBufferANDROID",

            (__eglMustCastToProperFunctionPointerType)&eglCreateNativeClientBufferANDROID },



    // EGL_ANDROID_get_native_client_buffer

    { "eglGetNativeClientBufferANDROID",

            (__eglMustCastToProperFunctionPointerType)&eglGetNativeClientBufferANDROID },



    // EGL_KHR_partial_update

    { "eglSetDamageRegionKHR",

            (__eglMustCastToProperFunctionPointerType)&eglSetDamageRegionKHR },
@@ -1980,6 +1986,17 @@ error_condition: 
    return setError(EGL_BAD_ALLOC, (EGLClientBuffer)0);

}



EGLClientBuffer eglGetNativeClientBufferANDROID(const AHardwareBuffer *buffer) {

    clearError();



    if (!buffer) return setError(EGL_BAD_PARAMETER, (EGLClientBuffer)0);



    // FIXME: remove this dangerous reinterpret_cast.

    const GraphicBuffer* graphicBuffer =

            reinterpret_cast<const GraphicBuffer*>(buffer);

    return static_cast<EGLClientBuffer>(graphicBuffer->getNativeBuffer());

}



// ----------------------------------------------------------------------------

// NVIDIA extensions

// ----------------------------------------------------------------------------

opengl/libs/EGL/egl_entries.in

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ EGL_ENTRY(EGLBoolean, eglSetSwapRectangleANDROID, EGLDisplay, EGLSurface, EGLint 
EGL_ENTRY(EGLClientBuffer, eglGetRenderBufferANDROID, EGLDisplay, EGLSurface)

EGL_ENTRY(EGLint, eglDupNativeFenceFDANDROID, EGLDisplay, EGLSyncKHR)

EGL_ENTRY(EGLClientBuffer, eglCreateNativeClientBufferANDROID, const EGLint *)

EGL_ENTRY(EGLClientBuffer, eglGetNativeClientBufferANDROID, const AHardwareBuffer *)



/* NVIDIA extensions */

opengl/libs/libEGL.map.txt

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ LIBEGL { 
    eglGetCurrentSurface;

    eglGetDisplay;

    eglGetError;

    eglGetNativeClientBufferANDROID; # introduced=26

    eglGetProcAddress;

    eglGetStreamFileDescriptorKHR; # introduced=23

    eglGetSyncAttribKHR; # introduced-arm=18 introduced-arm64=21 introduced-mips=18 introduced-mips64=21 introduced-x86=18 introduced-x86_64=21

opengl/specs/EGL_ANDROID_get_native_client_buffer.txt

0 → 100644
+96 −0
Original line number Diff line number Diff line 
Name



    ANDROID_get_native_client_buffer



Name Strings



    EGL_ANDROID_get_native_client_buffer



Contributors



    Craig Donner



Contact



    Craig Donner, Google Inc. (cdonner 'at' google.com)



Status



    Draft



Version



    Version 1.0, January 27, 2017



Number



    EGL Extension #XXX



Dependencies



    Requires EGL 1.2.



    EGL_ANDROID_image_native_buffer and EGL_KHR_image_base are required.



    This extension is written against the wording of the EGL 1.2

    Specification as modified by EGL_KHR_image_base and

    EGL_ANDROID_image_native_buffer.



Overview



    This extension allows creating an EGLClientBuffer from an Android

    AHardwareBuffer object which can be later used to create an EGLImage.



New Types



struct AHardwareBuffer



New Procedures and Functions



EGLClientBuffer eglGetNativeClientBufferANDROID(const AHardwareBuffer *buffer)



New Tokens



    None



Changes to Chapter 3 of the EGL 1.2 Specification (EGL Functions and Errors)



    Add the following to section 2.5.1 "EGLImage Specification" (as modified by

    the EGL_KHR_image_base and EGL_ANDROID_image_native_buffer specifications),

    below the description of eglCreateImageKHR:



   "The command



        EGLClientBuffer eglGeteNativeClientBufferANDROID(

                                AHardwareBuffer *buffer)



    may be used to create an EGLClientBuffer from an AHardwareBuffer object.

    EGL implementations must guarantee that the lifetime of the returned

    EGLClientBuffer is at least as long as the EGLImage(s) it is bound to,

    following the lifetime semantics described below in section 2.5.2; the

    EGLClientBuffer must be destroyed no earlier than when all of its associated

    EGLImages are destroyed by eglDestroyImageKHR.



    Errors



        If eglGeteNativeClientBufferANDROID fails, NULL will be returned, no

        memory will be allocated, and the following error will be generated:



       * If the value of buffer is NULL, the error EGL_BAD_PARAMETER is

         generated.



Issues



    1. Should this extension define what particular AHardwareBuffer formats EGL

    implementations are required to support?



    RESOLVED: No.



    The set of valid formats is implementation-specific and may depend on

    additional EGL extensions. The particular valid combinations for a given

    Android version and implementation should be documented by that version.



Revision History



#1 (Craig Donner, January 27, 2017)

    - Initial draft.