Merge changes I22f1b358,I5496d0de,Ifd98966b into jb-mr2-dev (bf667e31) · Commits · e / os / android_frameworks_native-old

libs/gui/GLConsumer.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -55,10 +55,10 @@ const bool GLConsumer::sUseNativeFenceSync = true;
		const bool GLConsumer::sUseNativeFenceSync = false;
		#endif

		// This compile option makes GLConsumer use the EGL_ANDROID_sync_wait
		// This compile option makes GLConsumer use the EGL_KHR_wait_sync
		// extension to insert server-side waits into the GLES command stream. This
		// feature requires the EGL_ANDROID_native_fence_sync and
		// EGL_ANDROID_wait_sync extensions.
		// EGL_KHR_wait_sync extensions.
		#ifdef USE_WAIT_SYNC
		static const bool useWaitSync = true;
		#else
		@@ -848,7 +848,7 @@ status_t GLConsumer::doGLFenceWaitLocked() const {
		// XXX: The spec draft is inconsistent as to whether this should
		// return an EGLint or void. Ignore the return value for now, as
		// it's not strictly needed.
		eglWaitSyncANDROID(dpy, sync, 0);
		eglWaitSyncKHR(dpy, sync, 0);
		EGLint eglErr = eglGetError();
		eglDestroySyncKHR(dpy, sync);
		if (eglErr != EGL_SUCCESS) {

opengl/include/EGL/eglext.h

+319 −74

File changed.

Preview size limit exceeded, changes collapsed.

opengl/include/EGL/eglplatform.h

+6 −1

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

		/* Platform-specific types and definitions for egl.h
		* $Revision: 9724 $ on $Date: 2009-12-02 02:05:33 -0800 (Wed, 02 Dec 2009) $
		* $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $
		*
		* 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
		@@ -60,6 +60,11 @@
		* Windows Device Context. They must be defined in platform-specific
		* code below. The EGL-prefixed versions of Native*Type are the same
		* types, renamed in EGL 1.3 so all types in the API start with "EGL".
		*
		* Khronos STRONGLY RECOMMENDS that you use the default definitions
		* provided below, since these changes affect both binary and source
		* portability of applications using EGL running on different EGL
		* implementations.
		*/

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

opengl/include/KHR/khrplatform.h

+46 −18

Original line number	Diff line number	Diff line
		@@ -24,8 +24,9 @@
		** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
		*/

		/* Platform-specific types and definitions.
		* $Revision: 7244 $ on $Date: 2009-01-20 17:06:59 -0800 (Tue, 20 Jan 2009) $
		/* Khronos platform-specific types and definitions.
		*
		* $Revision: 9356 $ on $Date: 2009-10-21 02:52:25 -0700 (Wed, 21 Oct 2009) $
		*
		* Adopters may modify this file to suit their platform. Adopters are
		* encouraged to submit platform specific modifications to the Khronos
		@@ -40,16 +41,16 @@
		*
		*
		* See the Implementer's Guidelines for information about where this file
		* should be located on your system.
		* should be located on your system and for more details of its use:
		* http://www.khronos.org/registry/implementers_guide.pdf
		*
		*
		* This file should be included as
		* #include <KHR/khrplatform.h>
		* by the Khronos API header file that uses its types and defines.
		* by Khronos client API header files that use its types and defines.
		*
		* The types in this file should only be used to define API-specific types.
		* Types defined in this file:
		* The types in khrplatform.h should only be used to define API-specific types.
		*
		* Types defined in khrplatform.h:
		* khronos_int8_t signed 8 bit
		* khronos_uint8_t unsigned 8 bit
		* khronos_int16_t signed 16 bit
		@@ -67,16 +68,25 @@
		* khronos_utime_nanoseconds_t unsigned time interval or absolute time in
		* nanoseconds
		* khronos_stime_nanoseconds_t signed time interval in nanoseconds
		* khronos_boolean_enum_t enumerated boolean type. This should
		* only be used as a base type when a client API's boolean type is
		* an enum. Client APIs which use an integer or other type for
		* booleans cannot use this as the base type for their boolean.
		*
		* Tokens defined in khrplatform.h:
		*
		* KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
		*
		* KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
		* KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
		*
		*
		* Macros defined in this file:
		* Calling convention macros defined in this file:
		* KHRONOS_APICALL
		* KHRONOS_APIENTRY
		* KHRONOS_APIATTRIBUTES
		*
		* These may be used in function prototypes as:
		*
		* KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
		* int arg1,
		* int arg2) KHRONOS_APIATTRIBUTES;
		@@ -239,5 +249,23 @@ typedef khronos_uint64_t khronos_utime_nanoseconds_t;
		typedef khronos_int64_t khronos_stime_nanoseconds_t;
		#endif

		/*
		* Dummy value used to pad enum types to 32 bits.
		*/
		#ifndef KHRONOS_MAX_ENUM
		#define KHRONOS_MAX_ENUM 0x7FFFFFFF
		#endif

		/*
		* Enumerated boolean type
		*
		* Values other than zero should be considered to be true. Therefore
		* comparisons should not be made against KHRONOS_TRUE.
		*/
		typedef enum {
		KHRONOS_FALSE = 0,
		KHRONOS_TRUE = 1,
		KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
		} khronos_boolean_enum_t;

		#endif /* __khrplatform_h_ */

opengl/libs/EGL/eglApi.cpp

+114 −23

File changed.

Preview size limit exceeded, changes collapsed.