diff options
author | Jason Ekstrand <[email protected]> | 2017-05-17 11:31:02 -0700 |
---|---|---|
committer | Jason Ekstrand <[email protected]> | 2017-05-23 16:46:38 -0700 |
commit | 00df1cd9d6234cdfc9fb2bf3615196ff83a3c956 (patch) | |
tree | e7260f8407a3baf89680ef6a6cabe84c9392af8d /src/intel/vulkan/anv_queue.c | |
parent | 10fad58b31ee2354330152ca4072327d228fc2e7 (diff) |
anv: Stop setting BO flags in bo_init_new
The idea behind doing this was to make it easier to set various flags.
However, we have enough custom flag settings floating around the driver
that this is more of a nuisance than a help. This commit has the
following functional changes:
1) The workaround_bo created in anv_CreateDevice loses both flags.
This shouldn't matter because it's very small and entirely internal
to the driver.
2) The bo created in anv_CreateDmaBufImageINTEL loses the
EXEC_OBJECT_ASYNC flag. In retrospect, it never should have gotten
EXEC_OBJECT_ASYNC in the first place.
Reviewed-by: Nanley Chery <[email protected]>
Cc: "17.1" <[email protected]>
Diffstat (limited to 'src/intel/vulkan/anv_queue.c')
-rw-r--r-- | src/intel/vulkan/anv_queue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/intel/vulkan/anv_queue.c b/src/intel/vulkan/anv_queue.c index 94c34c5d5af..be7fd310081 100644 --- a/src/intel/vulkan/anv_queue.c +++ b/src/intel/vulkan/anv_queue.c @@ -553,7 +553,7 @@ VkResult anv_CreateSemaphore( /* If we're going to use this as a fence, we need to *not* have the * EXEC_OBJECT_ASYNC bit set. */ - semaphore->permanent.bo->flags &= ~EXEC_OBJECT_ASYNC; + assert(!(semaphore->permanent.bo->flags & EXEC_OBJECT_ASYNC)); } else { assert(!"Unknown handle type"); vk_free2(&device->alloc, pAllocator, semaphore); @@ -644,7 +644,7 @@ VkResult anv_ImportSemaphoreFdKHX( /* If we're going to use this as a fence, we need to *not* have the * EXEC_OBJECT_ASYNC bit set. */ - bo->flags &= ~EXEC_OBJECT_ASYNC; + assert(!(bo->flags & EXEC_OBJECT_ASYNC)); anv_semaphore_impl_cleanup(device, &semaphore->permanent); |