Merge Mesa 23.3.6

3 files changed, 9 insertions, 11 deletions

diff --git a/lib/mesa/src/gallium/targets/d3dadapter9/drm.c b/lib/mesa/src/gallium/targets/d3dadapter9/drm.c
index ca7f9abb0..093454834 100644
--- a/lib/mesa/src/gallium/targets/d3dadapter9/drm.c
+++ b/lib/mesa/src/gallium/targets/d3dadapter9/drm.c
@@ -69,6 +69,7 @@ const driOptionDescription __driConfigOptionsNine[] = {
         DRI_CONF_NINE_SHADERINLINECONSTANTS(false)
         DRI_CONF_NINE_SHMEM_LIMIT()
         DRI_CONF_NINE_FORCESWRENDERINGONCPU(false)
+        DRI_CONF_NINE_FORCEFEATURESEMULATION(false)
     DRI_CONF_SECTION_END
     DRI_CONF_SECTION_DEBUG
         DRI_CONF_OVERRIDE_VRAM_SIZE()
@@ -166,7 +167,7 @@ read_descriptor( struct d3dadapter9_context *ctx,
                  "%s", ctx->hal->get_name(ctx->hal));
 
     if (override_vendorid > 0) {
-        found = FALSE;
+        found = false;
         /* fill in device_id and card name for fake vendor */
         for (i = 0; i < sizeof(fallback_cards)/sizeof(fallback_cards[0]); i++) {
             if (fallback_cards[i].vendor_id == override_vendorid) {
@@ -178,7 +179,7 @@ read_descriptor( struct d3dadapter9_context *ctx,
                 drvid->DeviceId = fallback_cards[i].device_id;
                 snprintf(drvid->Description, sizeof(drvid->Description),
                              "%s", fallback_cards[i].name);
-                found = TRUE;
+                found = true;
                 break;
             }
         }
@@ -234,7 +235,7 @@ drm_create_adapter( int fd,
     ctx->fd = fd;
     ctx->base.linear_framebuffer = different_device;
 
-    if (!pipe_loader_drm_probe_fd(&ctx->dev, fd)) {
+    if (!pipe_loader_drm_probe_fd(&ctx->dev, fd, false)) {
         ERR("Failed to probe drm fd %d.\n", fd);
         FREE(ctx);
         close(fd);
@@ -268,9 +269,9 @@ drm_create_adapter( int fd,
     if (driCheckOption(&userInitOptions, "throttle_value", DRI_INT)) {
         throttling_value_user = driQueryOptioni(&userInitOptions, "throttle_value");
         if (throttling_value_user == -1)
-            ctx->base.throttling = FALSE;
+            ctx->base.throttling = false;
         else if (throttling_value_user >= 0) {
-            ctx->base.throttling = TRUE;
+            ctx->base.throttling = true;
             ctx->base.throttling_value = throttling_value_user;
         }
     }
@@ -284,7 +285,7 @@ drm_create_adapter( int fd,
 
     if (ctx->base.tearfree_discard && !ctx->base.discard_delayed_release) {
         ERR("tearfree_discard requires discard_delayed_release\n");
-        ctx->base.tearfree_discard = FALSE;
+        ctx->base.tearfree_discard = false;
     }
 
     ctx->base.csmt_force = driQueryOptioni(&userInitOptions, "csmt_force");
@@ -292,6 +293,7 @@ drm_create_adapter( int fd,
     ctx->base.shader_inline_constants = driQueryOptionb(&userInitOptions, "shader_inline_constants");
     ctx->base.memfd_virtualsizelimit = driQueryOptioni(&userInitOptions, "texture_memory_limit");
     ctx->base.override_vram_size = driQueryOptioni(&userInitOptions, "override_vram_size");
+    ctx->base.force_emulation = driQueryOptionb(&userInitOptions, "force_features_emulation");
     sw_rendering = driQueryOptionb(&userInitOptions, "force_sw_rendering_on_cpu");
 
     driDestroyOptionCache(&userInitOptions);
diff --git a/lib/mesa/src/gallium/targets/dri-vdpau.dyn b/lib/mesa/src/gallium/targets/dri-vdpau.dyn
deleted file mode 100644
index a7919f7d3..000000000
--- a/lib/mesa/src/gallium/targets/dri-vdpau.dyn
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	nouveau_drm_screen_create;
-	radeon_drm_winsys_create;
-	amdgpu_winsys_create;
-};
diff --git a/lib/mesa/src/gallium/targets/dri/target.c b/lib/mesa/src/gallium/targets/dri/target.c
index d506869cb..9d3069eb0 100644
--- a/lib/mesa/src/gallium/targets/dri/target.c
+++ b/lib/mesa/src/gallium/targets/dri/target.c
@@ -99,6 +99,7 @@ DEFINE_LOADER_DRM_ENTRYPOINT(tegra);
 #if defined(GALLIUM_KMSRO)
 DEFINE_LOADER_DRM_ENTRYPOINT(armada_drm)
 DEFINE_LOADER_DRM_ENTRYPOINT(exynos)
+DEFINE_LOADER_DRM_ENTRYPOINT(hdlcd)
 DEFINE_LOADER_DRM_ENTRYPOINT(hx8357d)
 DEFINE_LOADER_DRM_ENTRYPOINT(ili9225)
 DEFINE_LOADER_DRM_ENTRYPOINT(ili9341)