start work on swrast rendering

SolDev69 · Dec 21, 2023 · b422365 · b422365
1 parent 1679e3b
commit b422365
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -49,15 +49,14 @@ jobs:
             -Dplatforms=android \
             -Dplatform-sdk-version=25 \
             -Dandroid-stub=true \
-            -Dllvm=disabled \
             -Dxlib-lease=disabled \
             -Degl=disabled \
             -Dgbm=disabled \
             -Dglx=disabled \
             -Dopengl=true \
             -Dosmesa=true \
             -Dvulkan-drivers= \
-            -Dgallium-drivers=freedreno,zink \
+            -Dgallium-drivers=freedreno,zink,swrast \
             -Dfreedreno-kmds=kgsl \
             -Dshared-glapi=false \
             -Dandroid-libbacktrace=disabled \

diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -1074,22 +1074,23 @@ llvmpipe_screen_late_init(struct llvmpipe_screen *screen)
 struct pipe_screen *
 llvmpipe_create_screen(struct sw_winsys *winsys)
 {
+   printf("LP: init\n");
    struct llvmpipe_screen *screen;
 
    glsl_type_singleton_init_or_ref();
-
+   printf("LP: get flags\n");
    LP_DEBUG = debug_get_flags_option("LP_DEBUG", lp_debug_flags, 0 );
 
    LP_PERF = debug_get_flags_option("LP_PERF", lp_perf_flags, 0 );
-
+   printf("LP: calloc\n");
    screen = CALLOC_STRUCT(llvmpipe_screen);
    if (!screen)
       return NULL;
 
    screen->winsys = winsys;
 
    screen->base.destroy = llvmpipe_destroy_screen;
-
+   printf("LP: init vars\n");
    screen->base.get_name = llvmpipe_get_name;
    screen->base.get_vendor = llvmpipe_get_vendor;
    screen->base.get_device_vendor = llvmpipe_get_vendor; // TODO should be the CPU vendor

diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
@@ -579,6 +579,7 @@ softpipe_screen_get_fd(struct pipe_screen *screen)
 struct pipe_screen *
 softpipe_create_screen(struct sw_winsys *winsys)
 {
+   printf("SP: init\n");
    struct softpipe_screen *screen = CALLOC_STRUCT(softpipe_screen);
 
    if (!screen)
@@ -589,7 +590,7 @@ softpipe_create_screen(struct sw_winsys *winsys)
    screen->winsys = winsys;
 
    screen->base.destroy = softpipe_destroy_screen;
-
+   printf("SP: init vars\n");
    screen->base.get_name = softpipe_get_name;
    screen->base.get_vendor = softpipe_get_vendor;
    screen->base.get_device_vendor = softpipe_get_vendor; // TODO should be the CPU vendor
@@ -605,7 +606,7 @@ softpipe_create_screen(struct sw_winsys *winsys)
    screen->base.get_compute_param = softpipe_get_compute_param;
    screen->base.get_compiler_options = softpipe_get_compiler_options;
    screen->use_llvm = sp_debug & SP_DBG_USE_LLVM;
-
+   printf("SP: init screen funcs\n");
    softpipe_init_screen_texture_funcs(&screen->base);
    softpipe_init_screen_fence_funcs(&screen->base);
 

diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build
@@ -55,7 +55,7 @@ libosmesa = shared_library(
     libmesa, libgallium, libws_null, osmesa_link_with,
   ],
   dependencies : [
-    dep_ws2_32, dep_selinux, dep_thread, dep_clock, dep_unwind, driver_freedreno, dep_libdrm, driver_zink
+    dep_ws2_32, dep_selinux, dep_thread, dep_clock, dep_unwind, driver_freedreno, dep_libdrm, driver_zink, driver_swrast
   ],
   name_prefix : host_machine.system() == 'windows' ? '' : [],  # otherwise mingw will create libosmesa.dll
   soversion : '',