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

Commit 42849948 authored by Brian Anderson's avatar Brian Anderson
Browse files

egl: Use reserved values for eglGetFrameTimestamps 

Also update opengl/specs/README so it's clear which blocks
of values are already reserved.

Bug: 36887025
Test: --deqp-case=dEQP-EGL*get_frame_timestamps*
Change-Id: I2cd83553cc475fdf3f8cdfadf2eaf32abc8a7c09
parent dc96fdfa

opengl/include/EGL/eglext.h

+13 −13
Original line number Diff line number Diff line
@@ -627,19 +627,19 @@ typedef EGLClientBuffer (EGLAPIENTRYP PFNEGLGETNATIVECLIENTBUFFERANDROID) (const 


#ifndef EGL_ANDROID_get_frame_timestamps

#define EGL_ANDROID_get_frame_timestamps 1

#define EGL_TIMESTAMPS_ANDROID 0x314D

#define EGL_COMPOSITE_DEADLINE_ANDROID 0x314E

#define EGL_COMPOSITE_INTERVAL_ANDROID 0x314F

#define EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID 0x3150

#define EGL_REQUESTED_PRESENT_TIME_ANDROID 0x3151

#define EGL_RENDERING_COMPLETE_TIME_ANDROID 0x3152

#define EGL_COMPOSITION_LATCH_TIME_ANDROID 0x3153

#define EGL_FIRST_COMPOSITION_START_TIME_ANDROID 0x3154

#define EGL_LAST_COMPOSITION_START_TIME_ANDROID 0x3155

#define EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID 0x3156

#define EGL_DISPLAY_PRESENT_TIME_ANDROID 0x3157

#define EGL_DEQUEUE_READY_TIME_ANDROID 0x3158

#define EGL_READS_DONE_TIME_ANDROID 0x3159

#define EGL_TIMESTAMPS_ANDROID 0x3430

#define EGL_COMPOSITE_DEADLINE_ANDROID 0x3431

#define EGL_COMPOSITE_INTERVAL_ANDROID 0x3432

#define EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID 0x3433

#define EGL_REQUESTED_PRESENT_TIME_ANDROID 0x3434

#define EGL_RENDERING_COMPLETE_TIME_ANDROID 0x3435

#define EGL_COMPOSITION_LATCH_TIME_ANDROID 0x3436

#define EGL_FIRST_COMPOSITION_START_TIME_ANDROID 0x3437

#define EGL_LAST_COMPOSITION_START_TIME_ANDROID 0x3438

#define EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID 0x3439

#define EGL_DISPLAY_PRESENT_TIME_ANDROID 0x343A

#define EGL_DEQUEUE_READY_TIME_ANDROID 0x343B

#define EGL_READS_DONE_TIME_ANDROID 0x343C

#define EGL_TIMESTAMP_PENDING_ANDROID EGL_CAST(EGLnsecsANDROID, -2)

#define EGL_TIMESTAMP_INVALID_ANDROID EGL_CAST(EGLnsecsANDROID, -1)

#ifdef EGL_EGLEXT_PROTOTYPES

opengl/specs/EGL_ANDROID_get_frame_timestamps.txt

+17 −14
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ Status 


Version



    Version 1, January 13, 2017

    Version 8, April 11, 2017



Number
@@ -81,19 +81,19 @@ New Procedures and Functions 


New Tokens



    EGL_TIMESTAMPS_ANDROID 0x314D

    EGL_COMPOSITE_DEADLINE_ANDROID 0x314E

    EGL_COMPOSITE_INTERVAL_ANDROID 0x314F

    EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID 0x3150

    EGL_REQUESTED_PRESENT_TIME_ANDROID 0x3151

    EGL_RENDERING_COMPLETE_TIME_ANDROID 0x3152

    EGL_COMPOSITION_LATCH_TIME_ANDROID 0x3153

    EGL_FIRST_COMPOSITION_START_TIME_ANDROID 0x3154

    EGL_LAST_COMPOSITION_START_TIME_ANDROID 0x3155

    EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID 0x3156

    EGL_DISPLAY_PRESENT_TIME_ANDROID 0x3157

    EGL_DEQUEUE_READY_TIME_ANDROID 0x3158

    EGL_READS_DONE_TIME_ANDROID 0x3159

    EGL_TIMESTAMPS_ANDROID 0x3430

    EGL_COMPOSITE_DEADLINE_ANDROID 0x3431

    EGL_COMPOSITE_INTERVAL_ANDROID 0x3432

    EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID 0x3433

    EGL_REQUESTED_PRESENT_TIME_ANDROID 0x3434

    EGL_RENDERING_COMPLETE_TIME_ANDROID 0x3435

    EGL_COMPOSITION_LATCH_TIME_ANDROID 0x3436

    EGL_FIRST_COMPOSITION_START_TIME_ANDROID 0x3437

    EGL_LAST_COMPOSITION_START_TIME_ANDROID 0x3438

    EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID 0x3439

    EGL_DISPLAY_PRESENT_TIME_ANDROID 0x343A

    EGL_DEQUEUE_READY_TIME_ANDROID 0x343B

    EGL_READS_DONE_TIME_ANDROID 0x343C

    EGL_TIMESTAMP_PENDING_ANDROID -2

    EGL_TIMESTAMP_INVALID_ANDROID -1
@@ -226,6 +226,9 @@ Issues 


Revision History



#8 (Brian Anderson, April 11, 2017)

    - Use reserved enumerant values.



#7 (Brian Anderson, March 21, 2017)

    - Differentiate between pending events and events that did not occur.

opengl/specs/README

+27 −15
Original line number Diff line number Diff line
@@ -4,8 +4,14 @@ been or are being defined for Android. 
The table below tracks usage of EGL enumerant values that have been reserved

for use by Android extensions.



See https://github.com/KhronosGroup/EGL-Registry/blob/master/api/egl.xml

for a list of all enumarant values currently reserved and registered with

Khronos.



     Value                       Extension

----------------     ----------------------------------

================     ==================================

0x3140 - 0x314F      Reserved block

================     ==================================

0x3140               EGL_NATIVE_BUFFER_ANDROID (EGL_ANDROID_image_native_buffer)

0x3141               EGL_PLATFORM_ANDROID_KHR (KHR_platform_android)

0x3142               EGL_RECORDABLE_ANDROID (EGL_ANDROID_recordable)
@@ -18,17 +24,23 @@ for use by Android extensions. 
0x314A               EGL_IMAGE_CROP_RIGHT_ANDROID (EGL_ANDROID_image_crop)

0x314B               EGL_IMAGE_CROP_BOTTOM_ANDROID (EGL_ANDROID_image_crop)

0x314C               EGL_FRONT_BUFFER_AUTO_REFRESH_ANDROID (EGL_ANDROID_front_buffer_auto_refresh)

0x314D               EGL_TIMESTAMPS_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x314E               EGL_COMPOSITE_DEADLINE_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x314F               EGL_COMPOSITE_INTERVAL_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3150               EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3151               EGL_REQUESTED_PRESENT_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3152               EGL_RENDERING_COMPLETE_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3153               EGL_COMPOSITION_LATCH_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3154               EGL_FIRST_COMPOSITION_START_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3155               EGL_LAST_COMPOSITION_START_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3156               EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3157               EGL_DISPLAY_PRESENT_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3158               EGL_DEQUEUE_READY_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3159               EGL_READS_DONE_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x315A - 0x315F      (unused)
 
0x314D - 0x314F      (unused)



     Value                       Extension

================     ==================================

0x3430 - 0x343F      Reserved block

================     ==================================

0x3430               EGL_TIMESTAMPS_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3431               EGL_COMPOSITE_DEADLINE_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3432               EGL_COMPOSITE_INTERVAL_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3433               EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3434               EGL_REQUESTED_PRESENT_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3435               EGL_RENDERING_COMPLETE_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3436               EGL_COMPOSITION_LATCH_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3437               EGL_FIRST_COMPOSITION_START_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3438               EGL_LAST_COMPOSITION_START_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x3439               EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x343A               EGL_DISPLAY_PRESENT_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x343B               EGL_DEQUEUE_READY_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x343C               EGL_READS_DONE_TIME_ANDROID (EGL_ANDROID_get_frame_timestamps)

0x343D - 0x343F      (unused)