summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2016-05-13 16:55:08 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2016-05-17 12:17:22 -0700
commitbe94a23b4402e1562eebc6aa6c485be2a2506a79 (patch)
tree2bc292e95bb5fa3491b8b473aa425dc343bcde8e
parent63dbb2c60aae593717159e53003cf8adac207aad (diff)
anv/wsi: Use vk_format_info for asserts rather than anv_format
-rw-r--r--src/intel/vulkan/anv_wsi_wayland.c3
-rw-r--r--src/intel/vulkan/anv_wsi_x11.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/intel/vulkan/anv_wsi_wayland.c b/src/intel/vulkan/anv_wsi_wayland.c
index 08eeda0a03..14062638f9 100644
--- a/src/intel/vulkan/anv_wsi_wayland.c
+++ b/src/intel/vulkan/anv_wsi_wayland.c
@@ -26,6 +26,7 @@
#include "anv_wsi.h"
+#include "vk_format_info.h"
#include <util/hash_table.h>
#define MIN_NUM_IMAGES 2
@@ -642,7 +643,7 @@ wsi_wl_image_init(struct wsi_wl_swapchain *chain, struct wsi_wl_image *image,
return result;
image->image = anv_image_from_handle(vk_image);
- assert(anv_format_is_color(image->image->format));
+ assert(vk_format_is_color(image->image->vk_format));
struct anv_surface *surface = &image->image->color_surface;
diff --git a/src/intel/vulkan/anv_wsi_x11.c b/src/intel/vulkan/anv_wsi_x11.c
index de56ca7f3d..d1e23a65d9 100644
--- a/src/intel/vulkan/anv_wsi_x11.c
+++ b/src/intel/vulkan/anv_wsi_x11.c
@@ -28,6 +28,7 @@
#include "anv_wsi.h"
+#include "vk_format_info.h"
#include "util/hash_table.h"
struct wsi_x11_connection {
@@ -614,7 +615,7 @@ x11_image_init(struct anv_device *device, struct x11_swapchain *chain,
return result;
image->image = anv_image_from_handle(image_h);
- assert(anv_format_is_color(image->image->format));
+ assert(vk_format_is_color(image->image->vk_format));
VkDeviceMemory memory_h;
result = anv_AllocateMemory(anv_device_to_handle(device),