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

Commit 4afe881a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12177962 from 10987caa to 24Q4-release 

Change-Id: Iff742a6684f7e6350d450fac734bcb6e3081598e
parents 672182e9 10987caa

libs/gui/SurfaceComposerClient.cpp

+0 −5
Original line number Diff line number Diff line
@@ -827,7 +827,6 @@ SurfaceComposerClient::Transaction::Transaction() { 


SurfaceComposerClient::Transaction::Transaction(const Transaction& other)

      : mId(other.mId),

        mTransactionNestCount(other.mTransactionNestCount),

        mAnimation(other.mAnimation),

        mEarlyWakeupStart(other.mEarlyWakeupStart),

        mEarlyWakeupEnd(other.mEarlyWakeupEnd),
@@ -867,7 +866,6 @@ SurfaceComposerClient::Transaction::createFromParcel(const Parcel* parcel) { 


status_t SurfaceComposerClient::Transaction::readFromParcel(const Parcel* parcel) {

    const uint64_t transactionId = parcel->readUint64();

    const uint32_t transactionNestCount = parcel->readUint32();

    const bool animation = parcel->readBool();

    const bool earlyWakeupStart = parcel->readBool();

    const bool earlyWakeupEnd = parcel->readBool();
@@ -964,7 +962,6 @@ status_t SurfaceComposerClient::Transaction::readFromParcel(const Parcel* parcel 


    // Parsing was successful. Update the object.

    mId = transactionId;

    mTransactionNestCount = transactionNestCount;

    mAnimation = animation;

    mEarlyWakeupStart = earlyWakeupStart;

    mEarlyWakeupEnd = earlyWakeupEnd;
@@ -996,7 +993,6 @@ status_t SurfaceComposerClient::Transaction::writeToParcel(Parcel* parcel) const 
    const_cast<SurfaceComposerClient::Transaction*>(this)->cacheBuffers();



    parcel->writeUint64(mId);

    parcel->writeUint32(mTransactionNestCount);

    parcel->writeBool(mAnimation);

    parcel->writeBool(mEarlyWakeupStart);

    parcel->writeBool(mEarlyWakeupEnd);
@@ -1148,7 +1144,6 @@ void SurfaceComposerClient::Transaction::clear() { 
    mInputWindowCommands.clear();

    mUncacheBuffers.clear();

    mMayContainBuffer = false;

    mTransactionNestCount = 0;

    mAnimation = false;

    mEarlyWakeupStart = false;

    mEarlyWakeupEnd = false;

libs/gui/include/gui/SurfaceComposerClient.h

+0 −1
Original line number Diff line number Diff line
@@ -451,7 +451,6 @@ public: 


        uint64_t mId;



        uint32_t mTransactionNestCount = 0;

        bool mAnimation = false;

        bool mEarlyWakeupStart = false;

        bool mEarlyWakeupEnd = false;

opengl/include/EGL/egl.h

+64 −25
Original line number Diff line number Diff line
@@ -6,39 +6,24 @@ extern "C" { 
#endif



/*

** Copyright (c) 2013-2017 The Khronos Group Inc.

** Copyright 2013-2020 The Khronos Group Inc.

** SPDX-License-Identifier: Apache-2.0

**

** Permission is hereby granted, free of charge, to any person obtaining a

** copy of this software and/or associated documentation files (the

** "Materials"), to deal in the Materials without restriction, including

** without limitation the rights to use, copy, modify, merge, publish,

** distribute, sublicense, and/or sell copies of the Materials, and to

** permit persons to whom the Materials are furnished to do so, subject to

** the following conditions:

**

** The above copyright notice and this permission notice shall be included

** in all copies or substantial portions of the Materials.

**

** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.

*/

/*

** This header is generated from the Khronos OpenGL / OpenGL ES XML

** API Registry. The current version of the Registry, generator scripts

** This header is generated from the Khronos EGL XML API Registry.

** The current version of the Registry, generator scripts

** used to make the header, and the header can be found at

**   http://www.khronos.org/registry/egl

**

** Khronos $Git commit SHA1: bae3518c48 $ on $Git commit date: 2018-05-17 10:56:57 -0700 $

** Khronos $Git commit SHA1: 800219cd6e $ on $Git commit date: 2024-05-13 00:13:13 -0700 $

*/



#include <EGL/eglplatform.h>



/* Generated on date 20180517 */

#ifndef EGL_EGL_PROTOTYPES

#define EGL_EGL_PROTOTYPES 1

#endif



/* Generated on date 20240715 */



/* Generated C header for:

 * API: egl
@@ -118,6 +103,31 @@ typedef void (*__eglMustCastToProperFunctionPointerType)(void); 
#define EGL_VERSION                       0x3054

#define EGL_WIDTH                         0x3057

#define EGL_WINDOW_BIT                    0x0004

typedef EGLBoolean (EGLAPIENTRYP PFNEGLCHOOSECONFIGPROC) (EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOPYBUFFERSPROC) (EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target);

typedef EGLContext (EGLAPIENTRYP PFNEGLCREATECONTEXTPROC) (EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list);

typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPBUFFERSURFACEPROC) (EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);

typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPIXMAPSURFACEPROC) (EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list);

typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEWINDOWSURFACEPROC) (EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYCONTEXTPROC) (EGLDisplay dpy, EGLContext ctx);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSURFACEPROC) (EGLDisplay dpy, EGLSurface surface);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCONFIGATTRIBPROC) (EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCONFIGSPROC) (EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config);

typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETCURRENTDISPLAYPROC) (void);

typedef EGLSurface (EGLAPIENTRYP PFNEGLGETCURRENTSURFACEPROC) (EGLint readdraw);

typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETDISPLAYPROC) (EGLNativeDisplayType display_id);

typedef EGLint (EGLAPIENTRYP PFNEGLGETERRORPROC) (void);

typedef __eglMustCastToProperFunctionPointerType (EGLAPIENTRYP PFNEGLGETPROCADDRESSPROC) (const char *procname);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLINITIALIZEPROC) (EGLDisplay dpy, EGLint *major, EGLint *minor);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLMAKECURRENTPROC) (EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYCONTEXTPROC) (EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value);

typedef const char *(EGLAPIENTRYP PFNEGLQUERYSTRINGPROC) (EGLDisplay dpy, EGLint name);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSURFACEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSPROC) (EGLDisplay dpy, EGLSurface surface);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLTERMINATEPROC) (EGLDisplay dpy);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITGLPROC) (void);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITNATIVEPROC) (EGLint engine);

#if EGL_EGL_PROTOTYPES

EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig (EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config);

EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers (EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target);

EGLAPI EGLContext EGLAPIENTRY eglCreateContext (EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list);
@@ -142,6 +152,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers (EGLDisplay dpy, EGLSurface surface 
EGLAPI EGLBoolean EGLAPIENTRY eglTerminate (EGLDisplay dpy);

EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL (void);

EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative (EGLint engine);

#endif

#endif /* EGL_VERSION_1_0 */



#ifndef EGL_VERSION_1_1
@@ -160,10 +171,16 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative (EGLint engine); 
#define EGL_TEXTURE_RGB                   0x305D

#define EGL_TEXTURE_RGBA                  0x305E

#define EGL_TEXTURE_TARGET                0x3081

typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDTEXIMAGEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint buffer);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLRELEASETEXIMAGEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint buffer);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLSURFACEATTRIBPROC) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPINTERVALPROC) (EGLDisplay dpy, EGLint interval);

#if EGL_EGL_PROTOTYPES

EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer);

EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer);

EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value);

EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval (EGLDisplay dpy, EGLint interval);

#endif

#endif /* EGL_VERSION_1_1 */



#ifndef EGL_VERSION_1_2
@@ -199,11 +216,18 @@ typedef void *EGLClientBuffer; 
#define EGL_SWAP_BEHAVIOR                 0x3093

#define EGL_UNKNOWN                       EGL_CAST(EGLint,-1)

#define EGL_VERTICAL_RESOLUTION           0x3091

typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDAPIPROC) (EGLenum api);

typedef EGLenum (EGLAPIENTRYP PFNEGLQUERYAPIPROC) (void);

typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPBUFFERFROMCLIENTBUFFERPROC) (EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLRELEASETHREADPROC) (void);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITCLIENTPROC) (void);

#if EGL_EGL_PROTOTYPES

EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI (EGLenum api);

EGLAPI EGLenum EGLAPIENTRY eglQueryAPI (void);

EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer (EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list);

EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread (void);

EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void);

#endif

#endif /* EGL_VERSION_1_2 */



#ifndef EGL_VERSION_1_3
@@ -232,7 +256,10 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void); 
#define EGL_OPENGL_API                    0x30A2

#define EGL_OPENGL_BIT                    0x0008

#define EGL_SWAP_BEHAVIOR_PRESERVED_BIT   0x0400

typedef EGLContext (EGLAPIENTRYP PFNEGLGETCURRENTCONTEXTPROC) (void);

#if EGL_EGL_PROTOTYPES

EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext (void);

#endif

#endif /* EGL_VERSION_1_4 */



#ifndef EGL_VERSION_1_5
@@ -284,6 +311,17 @@ typedef void *EGLImage; 
#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x30B8

#define EGL_IMAGE_PRESERVED               0x30D2

#define EGL_NO_IMAGE                      EGL_CAST(EGLImage,0)

typedef EGLSync (EGLAPIENTRYP PFNEGLCREATESYNCPROC) (EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCPROC) (EGLDisplay dpy, EGLSync sync);

typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCPROC) (EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBPROC) (EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *value);

typedef EGLImage (EGLAPIENTRYP PFNEGLCREATEIMAGEPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEPROC) (EGLDisplay dpy, EGLImage image);

typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYPROC) (EGLenum platform, void *native_display, const EGLAttrib *attrib_list);

typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEPROC) (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list);

typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC) (EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITSYNCPROC) (EGLDisplay dpy, EGLSync sync, EGLint flags);

#if EGL_EGL_PROTOTYPES

EGLAPI EGLSync EGLAPIENTRY eglCreateSync (EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list);

EGLAPI EGLBoolean EGLAPIENTRY eglDestroySync (EGLDisplay dpy, EGLSync sync);

EGLAPI EGLint EGLAPIENTRY eglClientWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout);
@@ -294,6 +332,7 @@ EGLAPI EGLDisplay EGLAPIENTRY eglGetPlatformDisplay (EGLenum platform, void *nat 
EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurface (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list);

EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurface (EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list);

EGLAPI EGLBoolean EGLAPIENTRY eglWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags);

#endif

#endif /* EGL_VERSION_1_5 */



#ifdef __cplusplus

opengl/include/EGL/eglext.h

+210 −27

File changed.

Preview size limit exceeded, changes collapsed.

opengl/include/EGL/eglplatform.h

+41 −30
Original line number Diff line number Diff line
@@ -2,36 +2,17 @@ 
#define __eglplatform_h_



/*

** Copyright (c) 2007-2016 The Khronos Group Inc.

**

** Permission is hereby granted, free of charge, to any person obtaining a

** copy of this software and/or associated documentation files (the

** "Materials"), to deal in the Materials without restriction, including

** without limitation the rights to use, copy, modify, merge, publish,

** distribute, sublicense, and/or sell copies of the Materials, and to

** permit persons to whom the Materials are furnished to do so, subject to

** the following conditions:

**

** The above copyright notice and this permission notice shall be included

** in all copies or substantial portions of the Materials.

**

** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.

** Copyright 2007-2020 The Khronos Group Inc.

** SPDX-License-Identifier: Apache-2.0

*/



/* Platform-specific types and definitions for egl.h

 * $Revision: 30994 $ on $Date: 2015-04-30 13:36:48 -0700 (Thu, 30 Apr 2015) $

 *

 * Adopters may modify khrplatform.h and this file to suit their platform.

 * You are encouraged to submit all modifications to the Khronos group so that

 * they can be included in future versions of this file.  Please submit changes

 * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)

 * by filing a bug against product "EGL" component "Registry".

 * by filing an issue or pull request on the public Khronos EGL Registry, at

 * https://www.github.com/KhronosGroup/EGL-Registry/

 */



#include <KHR/khrplatform.h>
@@ -67,7 +48,13 @@ 
 * implementations.

 */



#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */

#if defined(EGL_NO_PLATFORM_SPECIFIC_TYPES)



typedef void *EGLNativeDisplayType;

typedef void *EGLNativePixmapType;

typedef void *EGLNativeWindowType;



#elif defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */

#ifndef WIN32_LEAN_AND_MEAN

#define WIN32_LEAN_AND_MEAN 1

#endif
@@ -77,11 +64,23 @@ typedef HDC EGLNativeDisplayType; 
typedef HBITMAP EGLNativePixmapType;

typedef HWND    EGLNativeWindowType;



#elif defined(__QNX__)



typedef khronos_uintptr_t      EGLNativeDisplayType;

typedef struct _screen_pixmap* EGLNativePixmapType;  /* screen_pixmap_t */

typedef struct _screen_window* EGLNativeWindowType;  /* screen_window_t */



#elif defined(__EMSCRIPTEN__)



typedef int EGLNativeDisplayType;

typedef int EGLNativePixmapType;

typedef int EGLNativeWindowType;



#elif defined(__WINSCW__) || defined(__SYMBIAN32__)  /* Symbian */



typedef int   EGLNativeDisplayType;

typedef void *EGLNativeWindowType;

typedef void *EGLNativePixmapType;

typedef void *EGLNativeWindowType;



#elif defined(WL_EGL_PLATFORM)
@@ -100,17 +99,17 @@ typedef void *EGLNativeWindowType; 
struct ANativeWindow;

struct egl_native_pixmap_t;



typedef struct ANativeWindow*           EGLNativeWindowType;

typedef struct egl_native_pixmap_t*     EGLNativePixmapType;

typedef void*                           EGLNativeDisplayType;

typedef struct egl_native_pixmap_t*     EGLNativePixmapType;

typedef struct ANativeWindow*           EGLNativeWindowType;



#elif defined(USE_OZONE)



typedef intptr_t EGLNativeDisplayType;

typedef intptr_t EGLNativeWindowType;

typedef intptr_t EGLNativePixmapType;

typedef intptr_t EGLNativeWindowType;



#elif defined(__unix__) || defined(USE_X11)

#elif defined(USE_X11)



/* X11 (tentative)  */

#include <X11/Xlib.h>
@@ -120,11 +119,17 @@ typedef Display *EGLNativeDisplayType; 
typedef Pixmap   EGLNativePixmapType;

typedef Window   EGLNativeWindowType;



#elif defined(__unix__)



typedef void             *EGLNativeDisplayType;

typedef khronos_uintptr_t EGLNativePixmapType;

typedef khronos_uintptr_t EGLNativeWindowType;



#elif defined(__APPLE__)



typedef int   EGLNativeDisplayType;

typedef void *EGLNativeWindowType;

typedef void *EGLNativePixmapType;

typedef void *EGLNativeWindowType;



#elif defined(__HAIKU__)
@@ -134,6 +139,12 @@ typedef void *EGLNativeDisplayType; 
typedef khronos_uintptr_t  EGLNativePixmapType;

typedef khronos_uintptr_t  EGLNativeWindowType;



#elif defined(__Fuchsia__)



typedef void              *EGLNativeDisplayType;

typedef khronos_uintptr_t  EGLNativePixmapType;

typedef khronos_uintptr_t  EGLNativeWindowType;



#else

#error "Platform not recognized"

#endif