anv: pCreateInfo->pApplicationInfo parameter to vkCreateInstance may be NULL

[mesa.git] / src / vulkan / anv_allocator.c

diff --git a/src/vulkan/anv_allocator.c b/src/vulkan/anv_allocator.c
index e935cd71df0d26b309d75cce41d3103b61868de2..1f858bbdff4fa886f283dc44fca3b89049944665 100644 (file)
--- a/src/vulkan/anv_allocator.c
+++ b/src/vulkan/anv_allocator.c
@@ -441,7 +441,6 @@ anv_block_pool_grow(struct anv_block_pool *pool, struct anv_block_state *state)
       goto fail;
    cleanup->gem_handle = gem_handle;
 
-#if 0
    /* Regular objects are created I915_CACHING_CACHED on LLC platforms and
     * I915_CACHING_NONE on non-LLC platforms. However, userptr objects are
     * always created as I915_CACHING_CACHED, which on non-LLC means
@@ -453,7 +452,6 @@ anv_block_pool_grow(struct anv_block_pool *pool, struct anv_block_state *state)
       anv_gem_set_domain(pool->device, gem_handle,
                          I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT);
    }
-#endif
 
    /* Now that we successfull allocated everything, we can write the new
     * values back into pool. */
@@ -714,7 +712,7 @@ anv_state_stream_init(struct anv_state_stream *stream,
 void
 anv_state_stream_finish(struct anv_state_stream *stream)
 {
-   const uint32_t block_size = stream->block_pool->block_size;
+   VG(const uint32_t block_size = stream->block_pool->block_size);
 
    struct anv_state_stream_block *next = stream->block;
    while (next != NULL) {