diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index f959461fe08..77f7fccf76d 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -294,6 +294,9 @@ TODO: document the other workarounds.
             <option name="force_glsl_extensions_warn" value="true" />
             <!-- Enable draw merging inside display list for snx-03 -->
             <option name="allow_incorrect_primitive_id" value="true" />
+            <option name="allow_draw_out_of_order" value="true" />
+            <option name="mesa_glthread" value="true" />
+            <option name="mesa_no_error" value="true" />
         </application>
 
         <!-- Workaround for unsynchronized VBO updates on Dead Cells android
@@ -700,6 +703,8 @@ TODO: document the other workarounds.
         <application name="SPECviewperf13" executable="viewperf">
             <option name="radeonsi_sync_compile" value="true" />
             <option name="radeonsi_clamp_div_by_zero" value="true" />
+            <option name="radeonsi_inline_uniforms" value="true" />
+            <option name="radeonsi_shader_culling" value="true" />
         </application>
         <application name="Road Redemption" executable="RoadRedemption.x86_64">
             <option name="radeonsi_clamp_div_by_zero" value="true" />