From: Chia-I Wu <olvaffe@gmail.com>
Date: Mon, 26 Jan 2015 07:52:06 +0000 (+0800)
Subject: ilo: update SAMPLER_BORDER_COLOR_STATE for Gen8
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7e7e45db65968df7a56c8c5aabed0a700633c72b;p=mesa.git

ilo: update SAMPLER_BORDER_COLOR_STATE for Gen8
---

diff --git a/src/gallium/drivers/ilo/ilo_builder_3d_top.h b/src/gallium/drivers/ilo/ilo_builder_3d_top.h
index 3e6a183bf55..7714301ba30 100644
--- a/src/gallium/drivers/ilo/ilo_builder_3d_top.h
+++ b/src/gallium/drivers/ilo/ilo_builder_3d_top.h
@@ -1624,10 +1624,11 @@ static inline uint32_t
 gen6_SAMPLER_BORDER_COLOR_STATE(struct ilo_builder *builder,
                                 const struct ilo_sampler_cso *sampler)
 {
-   const int state_align = 32;
+   const int state_align =
+      (ilo_dev_gen(builder->dev) >= ILO_GEN(8)) ? 64 : 32;
    const int state_len = (ilo_dev_gen(builder->dev) >= ILO_GEN(7)) ? 4 : 12;
 
-   ILO_DEV_ASSERT(builder->dev, 6, 7.5);
+   ILO_DEV_ASSERT(builder->dev, 6, 8);
 
    assert(Elements(sampler->payload) >= 3 + state_len);