Skip to content

Commit de13a31

Browse files
HaseenaSainulHaseenaSainul
committed
Wayland-egl-bnxs: Integration changes for bcm-refsw-19.1
1 parent b15d9ff commit de13a31

6 files changed

Lines changed: 370 additions & 23 deletions

File tree

‎package/bcm-refsw/0007-static_assert.patch‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- BSEAV/lib/gpu/vc5/platform/nexus/display_nexus.c.orig 2019-01-23 17:21:13.301691128 -0500
2+
+++ BSEAV/lib/gpu/vc5/platform/nexus/display_nexus.c 2019-01-23 17:22:37.941918452 -0500
3+
@@ -271,7 +271,6 @@
4+
5+
static void SetWindowInfo(WindowInfo *dst, NXPL_NativeWindowInfoEXT *src)
6+
{
7+
- static_assert(sizeof(WindowInfo) == sizeof(NXPL_NativeWindowInfoEXT), "sizeof(WindowInfo) & sizeof(NXPL_NativeWindowInfoEXT) need to match");
8+
dst->width = src->width;
9+
dst->height = src->height;
10+
dst->x = src->x;

‎package/bcm-refsw/wayland-egl.inc‎

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
WAYLAND_EGL_DIR=${BCM_REFSW_VCX}/platform/wayland/
22
define BCM_REFSW_BUILD_WAYLAND_EGL
3+
if [ $(shell expr $(BCM_REFSW_VERSION) \< 19.1) = 1 ]; then \
34
$(TARGET_CONFIGURE_OPTS) \
45
$(TARGET_MAKE_ENV) \
56
$(BCM_REFSW_CONF_OPTS) \
@@ -8,8 +9,8 @@ define BCM_REFSW_BUILD_WAYLAND_EGL
89
WAYLAND_TOP=${STAGING_DIR}/usr \
910
WAYLAND_SCANNER=${HOST_DIR}/usr/bin/wayland-scanner \
1011
APPLIBS_TARGET_LIB_DIR=${BCM_REFSW_BIN} \
11-
APPLIBS_TARGET_INC_DIR=${BCM_REFSW_BIN}/include
12-
12+
APPLIBS_TARGET_INC_DIR=${BCM_REFSW_BIN}/include; \
13+
\
1314
$(TARGET_CONFIGURE_OPTS) \
1415
$(TARGET_MAKE_ENV) \
1516
$(BCM_REFSW_CONF_OPTS) \
@@ -18,8 +19,8 @@ define BCM_REFSW_BUILD_WAYLAND_EGL
1819
WAYLAND_SCANNER=${HOST_DIR}/usr/bin/wayland-scanner \
1920
WAYLAND_TOP=${STAGING_DIR}/usr \
2021
APPLIBS_TARGET_LIB_DIR=${BCM_REFSW_BIN} \
21-
APPLIBS_TARGET_INC_DIR=${BCM_REFSW_BIN}/include
22-
22+
APPLIBS_TARGET_INC_DIR=${BCM_REFSW_BIN}/include; \
23+
fi
2324
if [ $(shell expr $(BCM_REFSW_VERSION) \>= 17.1)$(shell expr $(BCM_REFSW_VERSION) \<= 17.3) = 11 ]; then \
2425
$(TARGET_CONFIGURE_OPTS) \
2526
$(TARGET_MAKE_ENV) \
@@ -42,7 +43,7 @@ if [ $(shell expr $(BCM_REFSW_VERSION) \>= 17.1)$(shell expr $(BCM_REFSW_VERSION
4243
APPLIBS_TARGET_INC_DIR=${BCM_REFSW_BIN}/include ; \
4344
fi
4445

45-
if [ $(shell expr $(BCM_REFSW_VERSION) \>= 17.4) = 1 ]; then \
46+
if [ $(shell expr $(BCM_REFSW_VERSION) \>= 17.4)$(shell expr $(BCM_REFSW_VERSION) \< 19.1) = 11 ]; then \
4647
$(TARGET_CONFIGURE_OPTS) \
4748
$(TARGET_MAKE_ENV) \
4849
$(BCM_REFSW_CONF_OPTS) \
@@ -59,18 +60,13 @@ endef
5960
ifeq ($(BCM_REFSW_PLATFORM_VC),vc5)
6061
define BCM_REFSW_INSTALL_STAGING_WAYLAND_EGL_GPU
6162
$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/interface/khronos/include/
62-
$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/interface/khronos/include/bcg_abstract/
63+
$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/interface/khronos/include/bcg_abstract
6364

6465
ln -sf ../../../EGL $(STAGING_DIR)/usr/include/interface/khronos/include/
6566
ln -sf ../../../GLES $(STAGING_DIR)/usr/include/interface/khronos/include/
6667
ln -sf ../../../GLES2 $(STAGING_DIR)/usr/include/interface/khronos/include/
6768
ln -sf ../helpers $(STAGING_DIR)/usr/include/interface/khronos/include/
6869

69-
$(INSTALL) -m 0644 $(@D)/BSEAV/lib/gpu/vc5/platform/nexus/*.h $(STAGING_DIR)/usr/include/interface/khronos/include
70-
$(INSTALL) -m 0644 $(@D)/BSEAV/lib/gpu/vc5/driver/libs/khrn/egl/platform/bcg_abstract/*.h $(STAGING_DIR)/usr/include/interface/khronos/include/bcg_abstract
71-
$(INSTALL) -m 0644 $(@D)/BSEAV/lib/gpu/vc5/driver/libs/platform/bcg_abstract/*.h $(STAGING_DIR)/usr/include/interface/khronos/include/bcg_abstract
72-
$(INSTALL) -m 0644 $(@D)/BSEAV/lib/gpu/vc5/driver/libs/platform/*.h $(STAGING_DIR)/usr/include/interface/khronos/include
73-
7470
$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/vcos
7571
$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/vcos/include
7672
$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/vcos/posix
@@ -90,8 +86,18 @@ ifeq ($(BCM_REFSW_PLATFORM_VC),vc5)
9086
$(INSTALL) -m 0644 $(@D)/BSEAV/lib/gpu/vc5/driver/libs/util/log/*.h $(STAGING_DIR)/usr/include/libs/util/log
9187
$(INSTALL) -m 0644 $(@D)/BSEAV/lib/gpu/vc5/driver/libs/core/v3d/*.h $(STAGING_DIR)/usr/include/libs/core/v3d
9288

89+
$(INSTALL) -m 0644 $(@D)/BSEAV/lib/gpu/vc5/platform/nexus/*.h $(STAGING_DIR)/usr/include/interface/khronos/include
90+
$(INSTALL) -m 0644 $(@D)/BSEAV/lib/gpu/vc5/driver/libs/khrn/egl/platform/bcg_abstract/*.h $(STAGING_DIR)/usr/include/interface/khronos/include/bcg_abstract
91+
$(INSTALL) -m 0644 $(@D)/BSEAV/lib/gpu/vc5/driver/libs/platform/*.h $(STAGING_DIR)/usr/include/interface/khronos/include
92+
93+
if [ $(shell expr $(BCM_REFSW_VERSION) \>= 19.1) = 1 ]; then \
94+
$(INSTALL) -m 0644 $(@D)/BSEAV/lib/gpu/vc5/driver/libs/platform/stb/*.h $(STAGING_DIR)/usr/include/interface/khronos/include/bcg_abstract; \
95+
$(INSTALL) -m 0644 $(@D)/BSEAV/lib/gpu/vc5/driver/libs/platform/stb/gmem_plat.inl $(STAGING_DIR)/usr/include/interface/khronos/include; \
96+
else \
97+
$(INSTALL) -m 0644 $(@D)/BSEAV/lib/gpu/vc5/driver/libs/platform/bcg_abstract/*.h $(STAGING_DIR)/usr/include/interface/khronos/include/bcg_abstract; \
98+
$(INSTALL) -m 0644 $(@D)/BSEAV/lib/gpu/vc5/driver/libs/platform/bcg_abstract/gmem_plat.inl $(STAGING_DIR)/usr/include/interface/khronos/include; \
99+
fi
93100
$(INSTALL) -m 0644 $(@D)/BSEAV/lib/gpu/vc5/driver/libs/platform/gmem.inl $(STAGING_DIR)/usr/include/interface/khronos/include
94-
$(INSTALL) -m 0644 $(@D)/BSEAV/lib/gpu/vc5/driver/libs/platform/bcg_abstract/gmem_plat.inl $(STAGING_DIR)/usr/include/interface/khronos/include
95101

96102
#ursr16.2 extra copy
97103
$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/GLES3
@@ -112,11 +118,6 @@ ifeq ($(BCM_REFSW_PLATFORM_VC),vc5)
112118
$(INSTALL) -m 0644 $(@D)/BSEAV/lib/gpu/vc5/platform/common/*.h $(STAGING_DIR)/usr/share/wayland-egl/common
113119
$(INSTALL) -m 0755 $(@D)/BSEAV/lib/gpu/vc5/platform/common/*.cpp $(STAGING_DIR)/usr/share/wayland-egl/common
114120

115-
#if [ -e $(@D)/trellis/display/weston/include/EGL/eglext.h ]; then \
116-
# $(INSTALL) -m 0755 $(@D)/trellis/display/weston/include/EGL/eglext.h $(STAGING_DIR)/usr/include/EGL; \
117-
# $(INSTALL) -m 0755 $(@D)/trellis/display/weston/include/EGL/eglext_brcm.h $(STAGING_DIR)/usr/include/EGL; \
118-
#fi
119-
120121
if [ -e $(@D)/magnum/basemodules/chp/include/${BCM_REFSW_BCHP_CHIP}/rdb/${BCM_REFSW_BCHP_VER_LOWER}/bchp_common.h ]; then \
121122
$(INSTALL) -m 0755 $(@D)/magnum/basemodules/chp/include/${BCM_REFSW_BCHP_CHIP}/rdb/${BCM_REFSW_BCHP_VER_LOWER}/bchp_common.h $(STAGING_DIR)/usr/include;\
122123
fi
@@ -127,6 +128,12 @@ ifeq ($(BCM_REFSW_PLATFORM_VC),vc5)
127128
if [ -e $(@D)/magnum/basemodules/chp/include/${BCM_REFSW_BCHP_CHIP}/rdb/${BCM_REFSW_BCHP_VER_LOWER}/bchp_m2mc.h ]; then \
128129
$(INSTALL) -m 0755 $(@D)/magnum/basemodules/chp/include/${BCM_REFSW_BCHP_CHIP}/rdb/${BCM_REFSW_BCHP_VER_LOWER}/bchp_m2mc.h $(STAGING_DIR)/usr/include; \
129130
fi
131+
if [ $(shell expr $(BCM_REFSW_VERSION) \>= 19.1) = 1 ]; then \
132+
$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/libs/core/gfx_buffer; \
133+
$(INSTALL) -m 0755 $(@D)/BSEAV/lib/gpu/vc5/driver/libs/core/gfx_buffer/*.h $(STAGING_DIR)/usr/include/libs/core/gfx_buffer; \
134+
$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/libs/core/lfmt; \
135+
$(INSTALL) -m 0755 $(@D)/BSEAV/lib/gpu/vc5/driver/libs/core/lfmt/*.h $(STAGING_DIR)/usr/include/libs/core/lfmt; \
136+
fi
130137
endef
131138
else
132139
define BCM_REFSW_INSTALL_STAGING_WAYLAND_EGL_GPU
@@ -142,7 +149,9 @@ define BCM_REFSW_INSTALL_WAYLAND_EGL_DEV
142149
$(call BCM_REFSW_INSTALL_WAYLAND_EGL, $(STAGING_DIR))
143150

144151
$(INSTALL) -m 644 package/bcm-refsw/${BCM_REFSW_PLATFORM_VC}/wayland-egl.pc $(STAGING_DIR)/usr/lib/pkgconfig/
145-
$(INSTALL) -m 644 $(WAYLAND_EGL_DIR)/autogen/*.h $(STAGING_DIR)/usr/include/refsw/
152+
if [ $(shell expr $(BCM_REFSW_VERSION) \< 19.1) = 1 ]; then \
153+
$(INSTALL) -m 644 $(WAYLAND_EGL_DIR)/autogen/*.h $(STAGING_DIR)/usr/include/refsw/; \
154+
fi
146155

147156
$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/share
148157
$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/share/wayland-egl
@@ -172,13 +181,21 @@ define BCM_REFSW_INSTALL_WAYLAND_EGL_DEV
172181
endef
173182

174183
define BCM_REFSW_INSTALL_WAYLAND_EGL
175-
$(INSTALL) -m 644 -D $(WAYLAND_EGL_DIR)/lib_${BCM_REFSW_PLATFORM}_release/*.so $(1)/usr/lib
184+
if [ $(shell expr $(BCM_REFSW_VERSION) \< 19.1) = 1 ]; then \
185+
$(INSTALL) -m 644 -D $(WAYLAND_EGL_DIR)/lib_${BCM_REFSW_PLATFORM}_release/*.so $(1)/usr/lib; \
186+
fi
176187
if [ $(shell expr $(BCM_REFSW_VERSION) \>= 17.1)$(shell expr $(BCM_REFSW_VERSION) \<= 17.3) = 11 ]; then \
177188
$(INSTALL) -m 644 -D $(WAYLAND_EGL_DIR)/lib_${BCM_REFSW_PLATFORM}_release/libbcm_wayland_egl.so $(1)/usr/lib/libwayland-egl.so ;\
178189
fi
179190
if [ $(shell expr $(BCM_REFSW_VERSION) \>= 18.2) = 1 ]; then \
180191
$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/libs/util/gfx_util/; \
181192
$(INSTALL) -m 0755 $(@D)/BSEAV/lib/gpu/${BCM_REFSW_PLATFORM_VC}/driver/libs/util/gfx_util/*.h $(STAGING_DIR)/usr/include/libs/util/gfx_util/; \
182-
$(INSTALL) -m 0755 $(@D)/magnum/portinginterface/${BCM_REFSW_PLATFORM_VC}/include/brcmv3d_drm.h $(STAGING_DIR)/usr/include/; \
193+
fi
194+
if [ $(shell expr $(BCM_REFSW_VERSION) \>= 19.1) = 1 ]; then \
195+
$(INSTALL) -m 0755 $(@D)/BSEAV/linux/driver/brcmv3d/include/uapi/drm/brcmv3d_drm.h $(STAGING_DIR)/usr/include/; \
196+
else \
197+
if [ $(shell expr $(BCM_REFSW_VERSION) \>= 18.2) = 1 ]; then \
198+
$(INSTALL) -m 0755 $(@D)/magnum/portinginterface/${BCM_REFSW_PLATFORM_VC}/include/brcmv3d_drm.h $(STAGING_DIR)/usr/include/; \
199+
fi \
183200
fi
184201
endef

0 commit comments

Comments
 (0)