From afcc59c24d2e42270b16999637cc1bdb29d39a34 Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Thu, 7 Jul 2016 08:12:03 -0600 Subject: layers: Rename pipelineLayout to pipeline_layout --- layers/core_validation.cpp | 6 +++--- layers/core_validation.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 918afe8d..7f00c91c 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -2611,7 +2611,7 @@ static bool validate_pipeline_shader_stage(debug_report_data *report_data, std::map descriptor_uses; collect_interface_by_descriptor_slot(report_data, module, accessible_ids, descriptor_uses); - auto pipelineLayout = pipeline->pipelineLayout; + auto pipelineLayout = pipeline->pipeline_layout; /* validate push constant usage */ pass &= validate_push_constant_usage(report_data, &pipelineLayout->pushConstantRanges, @@ -5859,7 +5859,7 @@ CreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t pPipeNode[i] = new PIPELINE_NODE; pPipeNode[i]->initGraphicsPipeline(&pCreateInfos[i]); pPipeNode[i]->render_pass_ci.initialize(getRenderPass(dev_data, pCreateInfos[i].renderPass)->pCreateInfo); - pPipeNode[i]->pipelineLayout = getPipelineLayout(dev_data, pCreateInfos[i].layout); + pPipeNode[i]->pipeline_layout = getPipelineLayout(dev_data, pCreateInfos[i].layout); skip_call |= verifyPipelineCreateState(dev_data, device, pPipeNode, i); } @@ -5903,7 +5903,7 @@ CreateComputePipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t // Create and initialize internal tracking data structure pPipeNode[i] = new PIPELINE_NODE; pPipeNode[i]->initComputePipeline(&pCreateInfos[i]); - pPipeNode[i]->pipelineLayout = getPipelineLayout(dev_data, pCreateInfos[i].layout); + pPipeNode[i]->pipeline_layout = getPipelineLayout(dev_data, pCreateInfos[i].layout); // memcpy(&pPipeNode[i]->computePipelineCI, (const void *)&pCreateInfos[i], sizeof(VkComputePipelineCreateInfo)); // TODO: Add Compute Pipeline Verification diff --git a/layers/core_validation.h b/layers/core_validation.h index 320833fa..91cfc06d 100644 --- a/layers/core_validation.h +++ b/layers/core_validation.h @@ -149,13 +149,13 @@ class PIPELINE_NODE { bool blendConstantsEnabled; // Blend constants enabled for any attachments // Store RPCI b/c renderPass may be destroyed after Pipeline creation safe_VkRenderPassCreateInfo render_pass_ci; - PIPELINE_LAYOUT_NODE const *pipelineLayout; + PIPELINE_LAYOUT_NODE const *pipeline_layout; // Default constructor PIPELINE_NODE() : pipeline{}, graphicsPipelineCI{}, computePipelineCI{}, active_shaders(0), duplicate_shaders(0), active_slots(), vertexBindingDescriptions(), vertexAttributeDescriptions(), attachments(), blendConstantsEnabled(false), render_pass_ci(), - pipelineLayout(nullptr) {} + pipeline_layout(nullptr) {} void initGraphicsPipeline(const VkGraphicsPipelineCreateInfo *pCreateInfo) { graphicsPipelineCI.initialize(pCreateInfo); -- cgit v1.2.3