i965/nir: Do not scalarize phis in non-scalar setups

[mesa.git] / src / mesa / drivers / dri / i965 / brw_device_info.c

diff --git a/src/mesa/drivers/dri/i965/brw_device_info.c b/src/mesa/drivers/dri/i965/brw_device_info.c
index f313b2b3c538261b56bf450cfa92ab7845f299a3..fcc243e1d4ca0655e1e650a6ca3a27042b96ce88 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_device_info.c
+++ b/src/mesa/drivers/dri/i965/brw_device_info.c
@@ -310,11 +310,16 @@ static const struct brw_device_info brw_device_info_chv = {
    .supports_simd16_3src = true,                    \
    .max_vs_threads = 336,                           \
    .max_gs_threads = 336,                           \
+   .max_hs_threads = 336,                           \
+   .max_ds_threads = 336,                           \
    .max_wm_threads = 64 * 6,                        \
+   .max_cs_threads = 56,                            \
    .urb = {                                         \
       .size = 192,                                  \
       .min_vs_entries = 64,                         \
       .max_vs_entries = 1856,                       \
+      .max_hs_entries = 672,                        \
+      .max_ds_entries = 1120,                       \
       .max_gs_entries = 640,                        \
    }
 
@@ -340,13 +345,20 @@ static const struct brw_device_info brw_device_info_bxt = {
    .is_broxton = 1,
    .gt = 1,
    .has_llc = false,
-   .max_vs_threads = 112,
-   .max_gs_threads = 112,
+
+   /* XXX: These are preliminary thread counts and URB sizes. */
+   .max_vs_threads = 56,
+   .max_hs_threads = 56,
+   .max_ds_threads = 56,
+   .max_gs_threads = 56,
    .max_wm_threads = 32,
+   .max_cs_threads = 28,
    .urb = {
       .size = 64,
       .min_vs_entries = 34,
       .max_vs_entries = 640,
+      .max_hs_entries = 80,
+      .max_ds_entries = 80,
       .max_gs_entries = 256,
    }
 };