From 04507b87bf60d0ee3bc305c61476f323434c14c6 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Sun, 12 Jul 2015 14:00:58 -0600 Subject: v106: Remove optional multisampleEnable --- demos/cube.c | 1 - demos/tri.c | 1 - layers/draw_state.cpp | 9 +++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/demos/cube.c b/demos/cube.c index 98c4671a..1d7a6a53 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -1453,7 +1453,6 @@ static void demo_prepare_pipeline(struct demo *demo) memset(&ms, 0, sizeof(ms)); ms.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; ms.sampleMask = 1; - ms.multisampleEnable = VK_FALSE; ms.rasterSamples = 1; // Two stages: vs and fs diff --git a/demos/tri.c b/demos/tri.c index 009a826a..4088e442 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -1098,7 +1098,6 @@ static void demo_prepare_pipeline(struct demo *demo) memset(&ms, 0, sizeof(ms)); ms.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; ms.sampleMask = 1; - ms.multisampleEnable = VK_FALSE; ms.rasterSamples = 1; // Two stages: vs and fs diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 5ec23467..5d31cd87 100644 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -624,10 +624,11 @@ static void deletePipelines() static uint32_t getNumSamples(const VkPipeline pipeline) { PIPELINE_NODE* pPipe = pipelineMap[pipeline.handle]; - if (VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO == pPipe->msStateCI.sType) { - if (pPipe->msStateCI.multisampleEnable) - return pPipe->msStateCI.rasterSamples; - } + // TODO: msStateCI.multisampleEnable has been removed from API, is there anything left to do here? +// if (VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO == pPipe->msStateCI.sType) { +// if (pPipe->msStateCI.multisampleEnable) +// return pPipe->msStateCI.rasterSamples; +// } return 1; } // Validate state related to the PSO -- cgit v1.2.3