[Mesa-dev] [PATCH] Revert "anv/pipeline: Don't assert on more than 32 samplers"

[Jason Ekstrand]

This reverts commit 5fe67607d261b2f85c8f89914fe9bfef4eaf7561.
---
 src/intel/vulkan/genX_pipeline.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index b6a537b..0ae9ead 100644
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
@@ -1081,13 +1081,7 @@ emit_3dstate_streamout(struct anv_pipeline *pipeline,
 static uint32_t
 get_sampler_count(const struct anv_shader_bin *bin)
 {
-   uint32_t count_by_4 = DIV_ROUND_UP(bin->bind_map.sampler_count, 4);
-
-   /* We can potentially have way more than 32 samplers and that's ok.
-    * However, the 3DSTATE_XS packets only have 3 bits to specify how
-    * many to pre-fetch and all values above 4 are marked reserved.
-    */
-   return MIN2(count_by_4, 4);
+   return DIV_ROUND_UP(bin->bind_map.sampler_count, 4);
 }
 
 static uint32_t
-- 
2.5.0.400.gff86faf