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

Commit bb84a96a authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken 

* changes:
  update EGL headers to the latest
  update GL ES stub libraries with the new GL ES headers
  fix OpenGL ES extension headers from khronos
  update the OpenGL ES headers to the latest
parents b4f689e6 e81a3cb2

opengl/include/EGL/egl.h

+1 −2
Original line number Diff line number Diff line 
/* -*- mode: c; tab-width: 8; -*- */

/* vi: set sw=4 ts=8: */

/* Reference version of egl.h for EGL 1.4.

 * $Revision: 7244 $ on $Date: 2009-01-20 17:06:59 -0800 (Tue, 20 Jan 2009) $

 * $Revision: 9356 $ on $Date: 2009-10-21 02:52:25 -0700 (Wed, 21 Oct 2009) $

 */



/*
@@ -109,7 +109,6 @@ typedef void *EGLClientBuffer; 
#define EGL_NATIVE_RENDERABLE		0x302D

#define EGL_NATIVE_VISUAL_ID		0x302E

#define EGL_NATIVE_VISUAL_TYPE		0x302F

#define EGL_PRESERVED_RESOURCES		0x3030

#define EGL_SAMPLES			0x3031

#define EGL_SAMPLE_BUFFERS		0x3032

#define EGL_SURFACE_TYPE		0x3033

opengl/include/EGL/eglext.h

+94 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ extern "C" { 
#endif



/*

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

** Copyright (c) 2007-2010 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
@@ -34,8 +34,8 @@ extern "C" { 


/* Header file version number */

/* Current version at http://www.khronos.org/registry/egl/ */

/* $Revision: 7244 $ on $Date: 2009-01-20 17:06:59 -0800 (Tue, 20 Jan 2009) $ */

#define EGL_EGLEXT_VERSION 3

/* $Revision: 11249 $ on $Date: 2010-05-05 09:54:28 -0700 (Wed, 05 May 2010) $ */

#define EGL_EGLEXT_VERSION 5



#ifndef EGL_KHR_config_attribs

#define EGL_KHR_config_attribs 1
@@ -120,6 +120,36 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGL 
#define EGL_GL_RENDERBUFFER_KHR			0x30B9	/* eglCreateImageKHR target */

#endif



#ifndef EGL_KHR_reusable_sync

#define EGL_KHR_reusable_sync 1



typedef void* EGLSyncKHR;

typedef khronos_utime_nanoseconds_t EGLTimeKHR;



#define EGL_SYNC_STATUS_KHR			0x30F1

#define EGL_SIGNALED_KHR			0x30F2

#define EGL_UNSIGNALED_KHR			0x30F3

#define EGL_TIMEOUT_EXPIRED_KHR			0x30F5

#define EGL_CONDITION_SATISFIED_KHR		0x30F6

#define EGL_SYNC_TYPE_KHR			0x30F7

#define EGL_SYNC_REUSABLE_KHR			0x30FA

#define EGL_SYNC_FLUSH_COMMANDS_BIT_KHR		0x0001	/* eglClientWaitSyncKHR <flags> bitfield */

#define EGL_FOREVER_KHR				0xFFFFFFFFFFFFFFFFull

#define EGL_NO_SYNC_KHR				((EGLSyncKHR)0)

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSyncKHR(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);

EGLAPI EGLBoolean EGLAPIENTRY eglDestroySyncKHR(EGLDisplay dpy, EGLSyncKHR sync);

EGLAPI EGLint EGLAPIENTRY eglClientWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);

EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);

EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttribKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);

#endif /* EGL_EGLEXT_PROTOTYPES */

typedef EGLSyncKHR (EGLAPIENTRYP PFNEGLCREATESYNCKHRPROC) (EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync);

typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);

#endif



#ifndef EGL_KHR_image_base

#define EGL_KHR_image_base 1

/* Most interfaces defined by EGL_KHR_image_pixmap above */
@@ -131,6 +161,67 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGL 
/* Interfaces defined by EGL_KHR_image above */

#endif



#ifndef EGL_IMG_context_priority

#define EGL_IMG_context_priority 1

#define EGL_CONTEXT_PRIORITY_LEVEL_IMG		0x3100

#define EGL_CONTEXT_PRIORITY_HIGH_IMG		0x3101

#define EGL_CONTEXT_PRIORITY_MEDIUM_IMG		0x3102

#define EGL_CONTEXT_PRIORITY_LOW_IMG		0x3103

#endif



#ifndef EGL_NV_coverage_sample

#define EGL_NV_coverage_sample 1

#define EGL_COVERAGE_BUFFERS_NV 0x30E0

#define EGL_COVERAGE_SAMPLES_NV 0x30E1

#endif



#ifndef EGL_NV_depth_nonlinear

#define EGL_NV_depth_nonlinear 1

#define EGL_DEPTH_ENCODING_NV 0x30E2

#define EGL_DEPTH_ENCODING_NONE_NV 0

#define EGL_DEPTH_ENCODING_NONLINEAR_NV 0x30E3

#endif



#ifndef EGL_NV_sync

#define EGL_NV_sync 1

#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_NV	0x30E6

#define EGL_SYNC_STATUS_NV			0x30E7

#define EGL_SIGNALED_NV				0x30E8

#define EGL_UNSIGNALED_NV			0x30E9

#define EGL_SYNC_FLUSH_COMMANDS_BIT_NV		0x0001

#define EGL_FOREVER_NV				0xFFFFFFFFFFFFFFFFull

#define EGL_ALREADY_SIGNALED_NV			0x30EA

#define EGL_TIMEOUT_EXPIRED_NV			0x30EB

#define EGL_CONDITION_SATISFIED_NV		0x30EC

#define EGL_SYNC_TYPE_NV			0x30ED

#define EGL_SYNC_CONDITION_NV			0x30EE

#define EGL_SYNC_FENCE_NV			0x30EF

#define EGL_NO_SYNC_NV				((EGLSyncNV)0)

typedef void* EGLSyncNV;

typedef unsigned long long EGLTimeNV;

#ifdef EGL_EGLEXT_PROTOTYPES

EGLSyncNV eglCreateFenceSyncNV (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);

EGLBoolean eglDestroySyncNV (EGLSyncNV sync);

EGLBoolean eglFenceNV (EGLSyncNV sync);

EGLint eglClientWaitSyncNV (EGLSyncNV sync, EGLint flags, EGLTimeNV timeout);

EGLBoolean eglSignalSyncNV (EGLSyncNV sync, EGLenum mode);

EGLBoolean eglGetSyncAttribNV (EGLSyncNV sync, EGLint attribute, EGLint *value);

#endif /* EGL_EGLEXT_PROTOTYPES */

typedef EGLSyncNV (EGLAPIENTRYP PFNEGLCREATEFENCESYNCNVPROC) (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCNVPROC) (EGLSyncNV sync);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLFENCENVPROC) (EGLSyncNV sync);

typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCNVPROC) (EGLSyncNV sync, EGLint flags, EGLTimeNV timeout);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCNVPROC) (EGLSyncNV sync, EGLenum mode);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBNVPROC) (EGLSyncNV sync, EGLint attribute, EGLint *value);

#endif



#ifndef EGL_KHR_fence_sync

#define EGL_KHR_fence_sync 1

/* Reuses most tokens and entry points from EGL_KHR_reusable_sync */

#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR	0x30F0

#define EGL_SYNC_CONDITION_KHR			0x30F8

#define EGL_SYNC_FENCE_KHR			0x30F9

#endif



#ifndef EGL_ANDROID_image_native_buffer

#define EGL_ANDROID_image_native_buffer 1
@@ -154,7 +245,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSetSwapRectangleANDROID (EGLDisplay dpy, EGLSur 
typedef EGLBoolean (EGLAPIENTRYP PFNEGLSETSWAPRECTANGLEANDROIDPROC) (EGLDisplay dpy, EGLSurface draw, EGLint left, EGLint top, EGLint width, EGLint height);

#endif





#ifdef __cplusplus

}

#endif

opengl/include/EGL/eglplatform.h

+4 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
*/



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

 * $Revision: 7244 $ on $Date: 2009-01-20 17:06:59 -0800 (Tue, 20 Jan 2009) $

 * $Revision: 9724 $ on $Date: 2009-12-02 02:05:33 -0800 (Wed, 02 Dec 2009) $

 *

 * 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
@@ -50,8 +50,10 @@ 
#define EGLAPI KHRONOS_APICALL

#endif



#ifndef EGLAPIENTRY

#define EGLAPIENTRY  KHRONOS_APIENTRY

#define EGLAPIENTRYP KHRONOS_APIENTRY*

#endif

#define EGLAPIENTRYP EGLAPIENTRY*



/* The types NativeDisplayType, NativeWindowType, and NativePixmapType

 * are aliases of window-system-dependent types, such as X Display * or

opengl/include/GLES/gl.h

+3 −2
Original line number Diff line number Diff line 
#ifndef __gl_h_

#define __gl_h_



/* $Revision: 7172 $ on $Date:: 2009-01-09 11:17:41 -0800 #$ */

/* $Revision: 10601 $ on $Date:: 2010-03-04 22:15:27 -0800 #$ */



#include <GLES/glplatform.h>
@@ -15,6 +15,7 @@ extern "C" { 
 */



typedef void             GLvoid;

typedef char             GLchar;

typedef unsigned int     GLenum;

typedef unsigned char    GLboolean;

typedef unsigned int     GLbitfield;
@@ -678,7 +679,7 @@ GL_API void GL_APIENTRY glGetFixedv (GLenum pname, GLfixed *params); 
GL_API void GL_APIENTRY glGetIntegerv (GLenum pname, GLint *params);

GL_API void GL_APIENTRY glGetLightxv (GLenum light, GLenum pname, GLfixed *params);

GL_API void GL_APIENTRY glGetMaterialxv (GLenum face, GLenum pname, GLfixed *params);

GL_API void GL_APIENTRY glGetPointerv (GLenum pname, void **params);

GL_API void GL_APIENTRY glGetPointerv (GLenum pname, GLvoid **params);

GL_API const GLubyte * GL_APIENTRY glGetString (GLenum name);

GL_API void GL_APIENTRY glGetTexEnviv (GLenum env, GLenum pname, GLint *params);

GL_API void GL_APIENTRY glGetTexEnvxv (GLenum env, GLenum pname, GLfixed *params);

opengl/include/GLES/glext.h

+397 −3

File changed.

Preview size limit exceeded, changes collapsed.