resolve merge conflicts of 8a094116b to stage-aosp-master (bb7e1b68) · Commits · e / os / android_frameworks_native

opengl/include/EGL/NOTICE

+1 −1

Original line number	Diff line number	Diff line
		Copyright (c) 2007-2009 The Khronos Group Inc.
		Copyright (c) 2007-2017 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

opengl/include/EGL/egl.h

+211 −293

File changed.

Preview size limit exceeded, changes collapsed.

opengl/include/EGL/eglext.h

+1074 −479

File changed.

Preview size limit exceeded, changes collapsed.

opengl/include/EGL/eglplatform.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		#define __eglplatform_h_

		/*
		** Copyright (c) 2007-2009 The Khronos Group Inc.
		** 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
		@@ -25,7 +25,7 @@
		*/

		/* Platform-specific types and definitions for egl.h
		* $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $
		* $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
		@@ -77,7 +77,7 @@ typedef HDC EGLNativeDisplayType;
		typedef HBITMAP EGLNativePixmapType;
		typedef HWND EGLNativeWindowType;

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

		typedef int EGLNativeDisplayType;
		typedef void *EGLNativeWindowType;
		@@ -121,6 +121,8 @@ typedef EGLNativeWindowType NativeWindowType;
		*/
		typedef khronos_int32_t EGLint;


		/* C++ / C typecast macros for special EGL handle values */
		#if defined(__cplusplus)
		#define EGL_CAST(type, value) (static_cast<type>(value))
		#else

opengl/include/GLES/NOTICE

+35 −2

Original line number	Diff line number	Diff line
		This document is licensed under the SGI Free Software B License Version 2.0.
		For details, see http://oss.sgi.com/projects/FreeB/ .
		Copyright (c) 2017 The Khronos Group Inc.

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.

		Copyright (c) 2013-2017 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.