mesa: name driver library appropriately

Rename the 'egl_drv' library and the various back ends to 'mesa_gpu_drv'
and 'mesa_gpu-<backend>'.

Fixes #4275.
This commit is contained in:
Josef Söntgen 2021-09-30 14:08:37 +02:00 committed by Norman Feske
parent 32c283d26f
commit f21cf3f8b1
27 changed files with 69 additions and 71 deletions

View File

@ -74,7 +74,7 @@ append config {
<service name="Gui"> <child name="wm"/> </service>
<service name="Report" label="shape"> <child name="wm"/> </service>
<service name="ROM" label="channel_list"> <child name="dynamic_rom" /> </service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>

View File

@ -118,7 +118,7 @@ append config {
<route>
<service name="Gui"> <child name="wm"/> </service>
<service name="Report" label="shape"> <child name="wm"/> </service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service>
<service name="ROM" label="apps"> <child name="test_reports" /> </service>
<service name="ROM" label="overlay"> <child name="test_reports" /> </service>
@ -144,7 +144,7 @@ append config {
<route>
<service name="Gui"> <child name="wm"/> </service>
<service name="Report" label="shape"> <child name="wm"/> </service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service>
<any-service> <parent /> <any-child/> </any-service>
</route>
</start>
@ -167,7 +167,7 @@ append config {
<route>
<service name="Gui"> <child name="wm"/> </service>
<service name="Report" label="shape"> <child name="wm"/> </service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service>
<any-service> <parent /> <any-child/> </any-service>
</route>
</start>
@ -190,7 +190,7 @@ append config {
<route>
<service name="Gui"> <child name="wm"/> </service>
<service name="Report" label="shape"> <child name="wm"/> </service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service>
<any-service> <parent /> <any-child/> </any-service>
</route>
</start>
@ -212,7 +212,7 @@ append config {
<route>
<service name="Gui"> <child name="wm"/> </service>
<service name="Report" label="shape"> <child name="wm"/> </service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service>
<any-service> <parent /> <any-child/> </any-service>
</route>
</start>

View File

@ -1 +1 @@
d94cb280e69b2663c9405efbd4117f04f2d9c563
c964a648360166b72246613a7be71bbfa6475d88

View File

@ -1,4 +1,4 @@
<runtime ram="34M" caps="400" binary="init">
<runtime ram="34M" caps="400" binary="gears">
<requires>
<gui/>
@ -24,34 +24,12 @@
</content>
<config>
<parent-provides>
<service name="ROM"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="Timer"/>
<service name="Gpu"/>
<service name="Gui"/>
</parent-provides>
<start name="gears" caps="300">
<resource name="RAM" quantum="32M"/>
<config>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" />
<vfs>
<dir name="dev">
<log/> <inline name="rtc">2000-01-01 00:00</inline>
</dir>
</vfs>
</config>
<route>
<service name="ROM" label="egl_drv.lib.so">
<parent label="mesa_gpu_drv.lib.so"/>
</service>
<any-service> <parent/> </any-service>
</route>
</start>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" />
<vfs>
<dir name="dev">
<log/> <inline name="rtc">2000-01-01 00:00</inline>
</dir>
</vfs>
</config>
</runtime>

View File

@ -1 +1 @@
SWRAST Gallium driver of MESA using solely the CPU
Softpipe Gallium driver of MESA using solely the CPU

View File

@ -5,7 +5,7 @@
</provides>
<content>
<rom label="egl_swrast.lib.so"/>
<rom label="mesa_gpu-softpipe.lib.so"/>
<rom label="fs_rom"/>
<rom label="init"/>
<rom label="vfs"/>
@ -15,7 +15,7 @@
<config>
<service name="ROM">
<default-policy> <child name="fs_rom" label="egl_swrast.lib.so"/> </default-policy>
<default-policy> <child name="fs_rom" label="mesa_gpu-softpipe.lib.so"/> </default-policy>
</service>
<parent-provides>
@ -33,7 +33,7 @@
<provides> <service name="File_system"/> </provides>
<config>
<vfs>
<rom name="egl_swrast.lib.so"/>
<rom name="mesa_gpu-softpipe.lib.so"/>
</vfs>
<default-policy root="/" writeable="no"/>
</config>

View File

@ -5,7 +5,7 @@
</provides>
<content>
<rom label="egl_iris.lib.so"/>
<rom label="mesa_gpu-iris.lib.so"/>
<rom label="fs_rom"/>
<rom label="init"/>
<rom label="vfs"/>
@ -15,7 +15,7 @@
<config verbose="yes">
<service name="ROM">
<default-policy> <child name="fs_rom" label="egl_iris.lib.so"/> </default-policy>
<default-policy> <child name="fs_rom" label="mesa_gpu-iris.lib.so"/> </default-policy>
</service>
<parent-provides>
@ -33,7 +33,7 @@
<provides> <service name="File_system"/> </provides>
<config verbose="yes">
<vfs>
<rom name="egl_iris.lib.so"/>
<rom name="mesa_gpu-iris.lib.so"/>
</vfs>
<default-policy root="/" writeable="no"/>
</config>

View File

@ -1,7 +1,7 @@
MIRROR_FROM_REP_DIR := \
lib/mk/egl.mk \
lib/mk/egl_etnaviv.mk \
lib/mk/egl_swrast.mk \
lib/mk/mesa_gpu-etnaviv.mk \
lib/mk/mesa_gpu-softpipe.mk \
lib/mk/etnaviv.mk \
lib/mk/iris_gen.inc \
lib/mk/isl_gen.inc \
@ -11,7 +11,7 @@ MIRROR_FROM_REP_DIR := \
lib/mk/mesa-common.inc \
lib/mk/softpipe.mk \
lib/mk/spec/arm_v8/mesa.mk \
lib/mk/spec/x86/egl_iris.mk \
lib/mk/spec/x86/mesa_gpu-iris.mk \
lib/mk/spec/x86/iris.mk \
lib/mk/spec/x86/iris_gen110.mk \
lib/mk/spec/x86/iris_gen120.mk \

View File

@ -100,9 +100,9 @@ set config {
<resource name="RAM" quantum="1M"/>
</start>}
set backend_library egl_swrast.lib.so
if {$use_iris} { set backend_library egl_iris.lib.so }
if {$use_etnaviv} { set backend_library egl_etnaviv.lib.so }
set backend_library mesa_gpu-softpipe.lib.so
if {$use_iris} { set backend_library mesa_gpu-iris.lib.so }
if {$use_etnaviv} { set backend_library mesa_gpu-etnaviv.lib.so }
append config "
<start name=\"$demo_binary\" caps=\"$demo_caps\">
@ -112,7 +112,7 @@ append config $demo_config
append config "
<route>
<service name=\"ROM\" label=\"egl_drv.lib.so\">
<service name=\"ROM\" label=\"mesa_gpu_drv.lib.so\">
<parent label=\"$backend_library\"/>
</service>"
append config {
@ -156,17 +156,17 @@ set boot_modules {
libc.lib.so vfs.lib.so libm.lib.so
egl.lib.so mesa.lib.so stdcxx.lib.so
expat.lib.so glapi.lib.so zlib.lib.so
core init ld.lib.so timer egl_swrast.lib.so
core init ld.lib.so timer mesa_gpu-softpipe.lib.so
libdrm.lib.so
}
append_if $use_iris boot_modules {
egl_iris.lib.so libdrm.lib.so
mesa_gpu-iris.lib.so libdrm.lib.so
intel_gpu_drv
}
append_if $use_etnaviv boot_modules {
egl_etnaviv.lib.so libdrm.lib.so
mesa_gpu-etnaviv.lib.so libdrm.lib.so
imx8q_gpu_drv
}

View File

@ -76,7 +76,7 @@ append config {
<service name="Report" label="shape">
<child name="pointer" label="wm -> qt_launchpad -> shape"/>
</service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so"> <parent label="mesa_gpu-softpipe.lib.so" /> </service>
<any-service> <parent /> <any-child/> </any-service>
</route>
</start>

View File

@ -40,7 +40,9 @@ append config {
<service name="Report" label="shape">
<child name="pointer" label="wm -> calculatorform -> shape"/>
</service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so">
<parent label="mesa_gpu-softpipe.lib.so" />
</service>
<any-service> <parent /> <any-child/> </any-service>
</route>
</start>

View File

@ -28,7 +28,9 @@ append config {
<service name="Report" label="shape">
<child name="pointer" label="wm -> openglwindow -> shape"/>
</service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so">
<parent label="mesa_gpu-softpipe.lib.so" />
</service>
<any-service> <parent /> <any-child/> </any-service>
</route>
<config>

View File

@ -78,7 +78,9 @@ append config {
<service name="Report" label="shape">
<child name="pointer" label="wm -> test-qpluginwidget -> shape"/>
</service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so">
<parent label="mesa_gpu-softpipe.lib.so" />
</service>
<any-service> <parent /> <any-child/> </any-service>
</route>
</start>

View File

@ -42,7 +42,9 @@ append config {
<service name="Report" label="shape">
<child name="pointer" label="wm -> test-qt_quick -> shape"/>
</service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so">
<parent label="mesa_gpu-softpipe.lib.so" />
</service>
<any-service> <parent /> <any-child/> </any-service>
</route>
</start>

View File

@ -45,7 +45,9 @@ append config {
<service name="Report" label="shape">
<child name="pointer" label="wm -> samegame -> shape"/>
</service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so">
<parent label="mesa_gpu-softpipe.lib.so"/>
</service>
<any-service> <parent /> <any-child/> </any-service>
</route>
</start>

View File

@ -40,7 +40,9 @@ append config {
<service name="Report" label="shape">
<child name="pointer" label="wm -> testqstring -> shape"/>
</service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so">
<parent label="mesa_gpu-softpipe.lib.so" />
</service>
<any-service> <parent /> <any-child/> </any-service>
</route>
</start>

View File

@ -40,7 +40,9 @@ append config {
<service name="Report" label="shape">
<child name="pointer" label="wm -> tetrix -> shape"/>
</service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so">
<parent label="mesa_gpu-softpipe.lib.so" />
</service>
<any-service> <parent /> <any-child/> </any-service>
</route>
</start>

View File

@ -55,7 +55,9 @@ append config {
<route>
<service name="Gui"> <child name="wm"/> </service>
<service name="Report" label="shape"> <child name="wm"/> </service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so">
<parent label="mesa_gpu-softpipe.lib.so" />
</service>
<any-service> <parent /> <any-child/> </any-service>
</route>
</start>
@ -78,7 +80,9 @@ append config {
<route>
<service name="Gui"> <child name="wm"/> </service>
<service name="Report" label="shape"> <child name="wm"/> </service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so">
<parent label="mesa_gpu-softpipe.lib.so" />
</service>
<any-service> <parent /> <any-child/> </any-service>
</route>
</start>

View File

@ -49,7 +49,9 @@ append config {
<service name="Report" label="shape">
<child name="pointer" label="wm -> basic -> shape"/>
</service>
<service name="ROM" label="egl_drv.lib.so"> <parent label="egl_swrast.lib.so" /> </service>
<service name="ROM" label="mesa_gpu_drv.lib.so">
<parent label="mesa_gpu-softpipe.lib.so" />
</service>
<any-service> <parent /> <any-child/> </any-service>
</route>
</start>

View File

@ -162,8 +162,8 @@ EGLBoolean dri2_initialize_genode(_EGLDisplay *disp)
{
void *handle;
if (!(handle = dlopen("egl_drv.lib.so", 0))) {
printf("Error: could not open EGL back end driver ('egl_drv.lib.so')\n");
if (!(handle = dlopen("mesa_gpu_drv.lib.so", 0))) {
printf("Error: could not open EGL back end driver ('mesa_gpu_drv.lib.so')\n");
return EGL_FALSE;
}

View File

@ -1 +1 @@
LIBS = egl_etnaviv
LIBS := mesa_gpu-etnaviv

View File

@ -1,2 +1,2 @@
TARGET = dummy-egl_iris
LIBS = egl_iris
TARGET = dummy-mesa_gpu-iris
LIBS = mesa_gpu-iris

View File

@ -85,7 +85,7 @@ index d64bc7c..9a25398 100644
#endif
if (driver == NULL) {
- snprintf(path, sizeof(path), "%.*s/%s_dri.so", len, p, driver_name);
+ snprintf(path, sizeof(path), "%.*s/egl_drv.lib.so", len, p);
+ snprintf(path, sizeof(path), "%.*s/mesa_gpu_drv.lib.so", len, p);
driver = dlopen(path, RTLD_NOW | RTLD_GLOBAL);
if (driver == NULL) {
dl_error = dlerror();

View File

@ -1 +1 @@
LIBS = egl_swrast
LIBS := mesa_gpu-softpipe