radv: display an error message if the winsys init failed

[mesa.git] / src / amd / vulkan / radv_descriptor_set.h

diff --git a/src/amd/vulkan/radv_descriptor_set.h b/src/amd/vulkan/radv_descriptor_set.h
index 5fd19d94482fc077435ea3de95dd366ff527c68e..3397acaa09206e8e45e2f80da36d6f3bfbdd60b3 100644 (file)
--- a/src/amd/vulkan/radv_descriptor_set.h
+++ b/src/amd/vulkan/radv_descriptor_set.h
@@ -24,9 +24,9 @@
 #ifndef RADV_DESCRIPTOR_SET_H
 #define RADV_DESCRIPTOR_SET_H
 
-#include <vulkan/vulkan.h>
+#include "radv_constants.h"
 
-#define MAX_SETS         32
+#include <vulkan/vulkan.h>
 
 struct radv_descriptor_set_binding_layout {
    VkDescriptorType type;
@@ -104,7 +104,7 @@ radv_immutable_samplers(const struct radv_descriptor_set_layout *set,
 static inline unsigned
 radv_combined_image_descriptor_sampler_offset(const struct radv_descriptor_set_binding_layout *binding)
 {
-       return binding->size - ((!binding->immutable_samplers_equal) ? 32 : 0);
+       return binding->size - ((!binding->immutable_samplers_equal) ? 16 : 0);
 }
 
 static inline const struct radv_sampler_ycbcr_conversion *