Commit graph

3 commits

Author SHA1 Message Date
Jeffy Chen
3987a274f7 {EGL, GLES}: Bump headers
Based on mesa3d 23.1.0-rc2.

Change-Id: I38ab18d9a198fcffddccf0389b97cacb5cfeb01d
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2025-03-12 18:31:37 +08:00
Jeffy Chen
c3b4a820e1 Support installing khrplatform.h again
Currently the KHR header is depended by mesa's EGL/GLES/GL headers, and
would be provided in mesa-common-dev.

So for the usage of mixing mesa's GL with mali's EGL/GLES, we have to
leave it to mesa's version and let mali uses it's own.

But for people who doesn't want mesa, let's add an option to allow
installing it in mali.

Change-Id: Id6e88e2d7f3c4f6092a3cf1f1078a6a7f284f823
Suggested-by: Gleb Mazovetskiy <glex.spb@gmail.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2021-01-30 04:44:34 +08:00
Jeffy Chen
83f8b828ef Rename khrplatform.h to mali_khrplatform.h
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>
2020-04-28 10:15:46 +08:00
Renamed from include/KHR/khrplatform.h (Browse further)