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

Commit 88e65fb0 authored by Andy McFadden's avatar Andy McFadden Committed by Android Git Automerger
Browse files

am 9d549c28: am 7284145d: Add eglPresentationTimeANDROID 

* commit '9d549c28':
  Add eglPresentationTimeANDROID
parents f4ba648e 9d549c28

opengl/include/EGL/eglext.h

+12 −0
Original line number Diff line number Diff line
@@ -311,6 +311,18 @@ typedef EGLint (EGLAPIENTRYP PFNEGLWAITSYNCANDROID) (EGLDisplay dpy, EGLSyncKHR 
#define EGL_FRAMEBUFFER_TARGET_ANDROID                0x3147

#endif



/* EGL_ANDROID_presentation_time

 */

#ifndef EGL_ANDROID_presentation_time

#define EGL_ANDROID_presentation_time 1

typedef khronos_stime_nanoseconds_t EGLnsecsANDROID;

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLBoolean eglPresentationTimeANDROID(EGLDisplay dpy, EGLSurface sur, EGLnsecsANDROID time);

#else

typedef EGLBoolean (EGLAPIENTRYP PFNEGLPRESENTATIONTIMEANDROID) (EGLDisplay dpy, EGLSurface sur, EGLnsecsANDROID time);

#endif

#endif



#ifdef __cplusplus

}

#endif

opengl/libs/EGL/eglApi.cpp

+22 −0
Original line number Diff line number Diff line
@@ -1307,6 +1307,28 @@ EGLint eglWaitSyncANDROID(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags) 
    return result;

}



EGLBoolean eglPresentationTimeANDROID(EGLDisplay dpy, EGLSurface surface,

        EGLnsecsANDROID time)

{

    clearError();



    const egl_display_ptr dp = validate_display(dpy);

    if (!dp) {

        return EGL_FALSE;

    }



    SurfaceRef _s(dp.get(), surface);

    if (!_s.get()) {

        setError(EGL_BAD_SURFACE, EGL_FALSE);

        return EGL_FALSE;

    }



    egl_surface_t const * const s = get_surface(surface);

    native_window_set_buffers_timestamp(s->win.get(), time);



    return EGL_TRUE;

}



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

// NVIDIA extensions

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

opengl/tools/glgen/specs/egl/EGL14.spec

+1 −0
Original line number Diff line number Diff line
@@ -31,3 +31,4 @@ EGLBoolean eglWaitGL ( void ) 
EGLBoolean eglWaitNative ( EGLint engine )

EGLBoolean eglSwapBuffers ( EGLDisplay dpy, EGLSurface surface )

EGLBoolean eglCopyBuffers ( EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target )

EGLBoolean eglPresentationTimeANDROID ( EGLDisplay dpy, EGLSurface sur, EGLnsecsANDROID time )

opengl/tools/glgen/src/JType.java

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ public class JType { 
    typeMapping.put(new CType("EGLNativeWindowType"), new JType("int"));

    typeMapping.put(new CType("EGLNativeDisplayType"), new JType("int"));

    typeMapping.put(new CType("EGLClientBuffer"), new JType("int"));

    typeMapping.put(new CType("EGLnsecsANDROID"), new JType("long"));



    // EGL nonprimitive types

    typeMapping.put(new CType("EGLConfig"), new JType("EGLConfig", true, false));

opengl/tools/glgen/src/JniCodeEmitter.java

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class JniCodeEmitter { 
        } else if (baseType.equals("short")) {

            jniName += "S";

        } else if (baseType.equals("long")) {

            jniName += "L";

            jniName += "J";

        } else if (baseType.equals("byte")) {

            jniName += "B";

        } else if (baseType.equals("String")) {