Build fixes

Author: worleydl

meson.options

@@ -83,7 +83,7 @@ option(
 option(
   'gallium-drivers',
   type : 'array',
-  value : ['d3d12','swrast'],
+  value : ['d3d12'],
   choices : [
     'all', 'auto',
     'asahi', 'crocus', 'd3d12', 'etnaviv', 'freedreno', 'i915', 'iris',

src/gallium/drivers/d3d12/d3d12_compiler.cpp

@@ -1101,9 +1101,9 @@ select_shader_variant(struct d3d12_selection_context *sel_ctx, d3d12_shader_sele
          dxil_nir_forward_front_face(new_nir_variant);
 
       if (key.fs.missing_dual_src_outputs) {
-         if (d3d12_is_missing_dual_src_target(new_nir_variant)) {
-            NIR_PASS_V(new_nir_variant, d3d12_add_missing_dual_src_target, key.fs.missing_dual_src_outputs);
-         }
+          if (d3d12_is_missing_dual_src_target(new_nir_variant)) {
+             NIR_PASS(_, new_nir_variant, d3d12_add_missing_dual_src_target, key.fs.missing_dual_src_outputs);
+          }
       } else if (key.fs.frag_result_color_lowering) {
          NIR_PASS(_, new_nir_variant, nir_lower_fragcolor,
                     key.fs.frag_result_color_lowering);

src/gallium/drivers/d3d12/d3d12_nir_passes.c

@@ -534,7 +534,6 @@ d3d12_lower_state_vars(nir_shader *nir, struct d3d12_shader *shader)
    return progress;
 }
 
-bool
 bool
 d3d12_is_missing_dual_src_target(struct nir_shader *s)
 {
@@ -544,6 +543,8 @@ d3d12_is_missing_dual_src_target(struct nir_shader *s)
    }
    return true;
 }
+
+bool
 d3d12_add_missing_dual_src_target(struct nir_shader *s,
                                   unsigned missing_mask)
 {

src/gallium/drivers/d3d12/d3d12_nir_passes.h

@@ -82,7 +82,7 @@ d3d12_lower_uint_cast(nir_shader *nir, bool is_signed);
 bool
 d3d12_is_missing_dual_src_target(struct nir_shader *s);
 
-void
+bool
 d3d12_add_missing_dual_src_target(struct nir_shader *s,
                                   unsigned missing_mask);
 

src/gallium/targets/wgl/meson.build

@@ -20,7 +20,7 @@ libgallium_wgl = shared_library(
   ],
   link_whole : [libwgl, libgdi_uwp],
   link_with : [
-    libgallium, libglsl, libmesa, libwsgdi, libglapi_static, libglapi, libgalliumvl_stub, libgdi_uwp
+    libgallium, libglsl, libmesa, libwsgdi, libglapi_bridge, libglapi, libgalliumvl_stub, libgdi_uwp
   ],
   dependencies : [
     dep_ws2_32, idep_nir, idep_mesautil, driver_swrast,

src/gallium/targets/wgl/wgl.c

@@ -113,9 +113,6 @@ wgl_screen_create_by_name(HDC hDC, const char* driver, struct sw_winsys *winsys)
    return screen;
 }
 
-struct sw_winsys*
-   gdi_create_sw_winsys(void);
-
 static struct pipe_screen *
 wgl_screen_create(HDC hDC)
 {