diff options
| author | Jason Ekstrand <[email protected]> | 2017-03-07 09:25:14 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-03-07 15:22:16 -0800 |
| commit | 33301d949f12ab639a2bf1eb1bb147091c52e05e (patch) | |
| tree | 75dc56eace64cf4f6ba3fe425323fc7ff64ed7ee | |
| parent | a316d8f406080cbfe516c7deaf52968de2eadfed (diff) | |
anv: Drop the anv_validate block helper
Over the course of driver development, we've come up with a number of
different schemes for adding giant blocks of asserts inside the driver.
This one is only being used once in anv_pipeline.c and the way it's
being used actually generates compiler warnings in release builds. This
commit drops the anv_validate macro and just puts the contents of the
one validation function in side of a "#ifdef DEBUG" guard.
Reviewed-by: Lionel Landwerlin <[email protected]>
| -rw-r--r-- | src/intel/vulkan/anv_pipeline.c | 6 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_private.h | 10 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 0db9f689268..dc65e268de3 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -1119,6 +1119,7 @@ copy_non_dynamic_state(struct anv_pipeline *pipeline, static void anv_pipeline_validate_create_info(const VkGraphicsPipelineCreateInfo *info) { +#ifdef DEBUG struct anv_render_pass *renderpass = NULL; struct anv_subpass *subpass = NULL; @@ -1158,6 +1159,7 @@ anv_pipeline_validate_create_info(const VkGraphicsPipelineCreateInfo *info) break; } } +#endif } /** @@ -1189,9 +1191,7 @@ anv_pipeline_init(struct anv_pipeline *pipeline, { VkResult result; - anv_validate { - anv_pipeline_validate_create_info(pCreateInfo); - } + anv_pipeline_validate_create_info(pCreateInfo); if (alloc == NULL) alloc = &device->alloc; diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 7d3fd40d7c5..b53d3d8ce4d 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -270,16 +270,6 @@ void anv_loge_v(const char *format, va_list va); #endif /** - * If a block of code is annotated with anv_validate, then the block runs only - * in debug builds. - */ -#ifdef DEBUG -#define anv_validate if (1) -#else -#define anv_validate if (0) -#endif - -/** * A dynamically growable, circular buffer. Elements are added at head and * removed from tail. head and tail are free-running uint32_t indices and we * only compute the modulo with size when accessing the array. This way, |