starred/libmali-rockchip-tsukumijima
1
0
Fork 0
mirror of https://github.com/tsukumijima/libmali-rockchip.git synced 2026-01-24 00:10:50 +01:00
Code Issues Projects Packages Wiki Activity Actions

Rename khrplatform.h to mali_khrplatform.h

Browse source 
The mesa upstream decided to install khrplatform.h within GL(dev), which
would conflit with ours:
dpkg: error processing archive /var/cache/apt/archives/mesa-common-dev_18.3.6-2+deb10u1_arm64.deb (--unpack):
trying to overwrite '/usr/include/KHR/khrplatform.h', which is also in package libmali-rk-dev:arm64 1.7-1

Let's rename it to avoid that.

Done by these commands:
mv include/KHR/{,mali_}khrplatform.h
ag khrplatform.h -l|xargs sed -i "s/\<khrplatform.h/mali_khrplatform.h/g"

Change-Id: I1aec209c60481332ffecd033ed9433e91cc5fb97
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
This commit is contained in:
Jeffy Chen 2020-04-28 09:45:37 +08:00
parent 8867101e50
commit 83f8b828ef
13 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/EGL/egl.h
View file

@ -57,7 +57,7 @@ extern "C" {
#define EGL_VERSION_1_0 1
typedef unsigned int EGLBoolean;
typedef void *EGLDisplay;
#include <KHR/khrplatform.h>
#include <KHR/mali_khrplatform.h>
#include <EGL/eglplatform.h>
typedef void *EGLConfig;
typedef void *EGLSurface;

6
include/EGL/eglplatform.h
View file

@ -27,14 +27,14 @@
/* 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.
* Adopters may modify mali_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".
*/
#include <KHR/khrplatform.h>
#include <KHR/mali_khrplatform.h>
/* Macros used in EGL function prototype declarations.
*
@ -43,7 +43,7 @@
* EGLAPI return-type EGLAPIENTRY eglFunction(arguments);
* typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments);
*
* KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h
* KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/mali_khrplatform.h
*/
#ifndef EGLAPI

2
include/FBDEV/egl.h
View file

@ -53,7 +53,7 @@ extern "C" {
#define EGL_VERSION_1_0 1
typedef unsigned int EGLBoolean;
typedef void *EGLDisplay;
#include <KHR/khrplatform.h>
#include <KHR/mali_khrplatform.h>
#include <EGL/eglplatform.h>
typedef void *EGLConfig;
typedef void *EGLSurface;

6
include/FBDEV/eglplatform.h
View file

@ -27,14 +27,14 @@
/* 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.
* Adopters may modify mali_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".
*/
#include <KHR/khrplatform.h>
#include <KHR/mali_khrplatform.h>
/* Macros used in EGL function prototype declarations.
*
@ -43,7 +43,7 @@
* EGLAPI return-type EGLAPIENTRY eglFunction(arguments);
* typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments);
*
* KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h
* KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/mali_khrplatform.h
*/
#ifndef EGLAPI

2
include/GLES/gl.h
View file

@ -50,7 +50,7 @@ extern "C" {
#ifndef GL_VERSION_ES_CM_1_0
#define GL_VERSION_ES_CM_1_0 1
#include <KHR/khrplatform.h>
#include <KHR/mali_khrplatform.h>
typedef char GLchar;

4
include/GLES/glplatform.h
View file

@ -19,13 +19,13 @@
/* Platform-specific types and definitions for OpenGL ES 1.X gl.h
*
* Adopters may modify khrplatform.h and this file to suit their platform.
* Adopters may modify mali_khrplatform.h and this file to suit their platform.
* Please contribute modifications back to Khronos as pull requests on the
* public github repository:
* https://github.com/KhronosGroup/OpenGL-Registry
*/
#include <KHR/khrplatform.h>
#include <KHR/mali_khrplatform.h>
#ifndef GL_API
#define GL_API KHRONOS_APICALL

2
include/GLES2/gl2.h
View file

@ -58,7 +58,7 @@ extern "C" {
#ifndef GL_ES_VERSION_2_0
#define GL_ES_VERSION_2_0 1
#include <KHR/khrplatform.h>
#include <KHR/mali_khrplatform.h>
typedef khronos_int8_t GLbyte;
typedef khronos_float_t GLclampf;
typedef khronos_int32_t GLfixed;

4
include/GLES2/gl2platform.h
View file

@ -19,13 +19,13 @@
/* Platform-specific types and definitions for OpenGL ES 2.X gl2.h
*
* Adopters may modify khrplatform.h and this file to suit their platform.
* Adopters may modify mali_khrplatform.h and this file to suit their platform.
* Please contribute modifications back to Khronos as pull requests on the
* public github repository:
* https://github.com/KhronosGroup/OpenGL-Registry
*/
#include <KHR/khrplatform.h>
#include <KHR/mali_khrplatform.h>
#ifndef GL_APICALL
#define GL_APICALL KHRONOS_APICALL

2
include/GLES3/gl3.h
View file

@ -58,7 +58,7 @@ extern "C" {
#ifndef GL_ES_VERSION_2_0
#define GL_ES_VERSION_2_0 1
#include <KHR/khrplatform.h>
#include <KHR/mali_khrplatform.h>
typedef khronos_int8_t GLbyte;
typedef khronos_float_t GLclampf;
typedef khronos_int32_t GLfixed;

2
include/GLES3/gl31.h
View file

@ -60,7 +60,7 @@ extern "C" {
#ifndef GL_ES_VERSION_2_0
#define GL_ES_VERSION_2_0 1
#include <KHR/khrplatform.h>
#include <KHR/mali_khrplatform.h>
typedef khronos_int8_t GLbyte;
typedef khronos_float_t GLclampf;
typedef khronos_int32_t GLfixed;

2
include/GLES3/gl32.h
View file

@ -60,7 +60,7 @@ extern "C" {
#ifndef GL_ES_VERSION_2_0
#define GL_ES_VERSION_2_0 1
#include <KHR/khrplatform.h>
#include <KHR/mali_khrplatform.h>
typedef khronos_int8_t GLbyte;
typedef khronos_float_t GLclampf;
typedef khronos_int32_t GLfixed;

4
include/GLES3/gl3platform.h
View file

@ -19,13 +19,13 @@
/* Platform-specific types and definitions for OpenGL ES 3.X gl3.h
*
* Adopters may modify khrplatform.h and this file to suit their platform.
* Adopters may modify mali_khrplatform.h and this file to suit their platform.
* Please contribute modifications back to Khronos as pull requests on the
* public github repository:
* https://github.com/KhronosGroup/OpenGL-Registry
*/
#include <KHR/khrplatform.h>
#include <KHR/mali_khrplatform.h>
#ifndef GL_APICALL
#define GL_APICALL KHRONOS_APICALL

12
include/KHR/khrplatform.h → include/KHR/mali_khrplatform.h
View file

@ -26,9 +26,9 @@
/* Khronos platform-specific types and definitions.
*
* The master copy of khrplatform.h is maintained in the Khronos EGL
* The master copy of mali_khrplatform.h is maintained in the Khronos EGL
* Registry repository at https://github.com/KhronosGroup/EGL-Registry
* The last semantic modification to khrplatform.h was at commit ID:
* The last semantic modification to mali_khrplatform.h was at commit ID:
* 67a3e0864c2d75ea5287b9f3d2eb74a745936692
*
* Adopters may modify this file to suit their platform. Adopters are
@ -43,12 +43,12 @@
* http://www.khronos.org/registry/implementers_guide.pdf
*
* This file should be included as
* #include <KHR/khrplatform.h>
* #include <KHR/mali_khrplatform.h>
* by Khronos client API header files that use its types and defines.
*
* The types in khrplatform.h should only be used to define API-specific types.
* The types in mali_khrplatform.h should only be used to define API-specific types.
*
* Types defined in khrplatform.h:
* Types defined in mali_khrplatform.h:
* khronos_int8_t signed 8 bit
* khronos_uint8_t unsigned 8 bit
* khronos_int16_t signed 16 bit
@ -71,7 +71,7 @@
* 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:
* Tokens defined in mali_khrplatform.h:
*
* KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
*