diff options
| author | Tony Barbour <tony@LunarG.com> | 2015-06-26 10:18:34 -0600 |
|---|---|---|
| committer | Tony Barbour <tony@LunarG.com> | 2015-06-26 10:18:34 -0600 |
| commit | 3ca22500cd0e92af6f7e7052f257f2e14a777334 (patch) | |
| tree | 3ffda45b05de4c80e246764fe54dec650709828f | |
| parent | 4e44255e46637d32cfd52787d5e134cdcab6ec62 (diff) | |
| download | usermoji-3ca22500cd0e92af6f7e7052f257f2e14a777334.tar.xz | |
vulkan.h: Bug 13616 Clarification of types of sample counts
| -rw-r--r-- | demos/cube.c | 2 | ||||
| -rw-r--r-- | demos/tri.c | 2 | ||||
| -rw-r--r-- | include/vulkan.h | 2 | ||||
| -rw-r--r-- | layers/draw_state.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/demos/cube.c b/demos/cube.c index 13fbbbe1..f86c6933 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -1389,7 +1389,7 @@ static void demo_prepare_pipeline(struct demo *demo) ms.sType = VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO; ms.sampleMask = 1; ms.multisampleEnable = VK_FALSE; - ms.samples = 1; + ms.rasterSamples = 1; // Two stages: vs and fs pipeline.stageCount = 2; diff --git a/demos/tri.c b/demos/tri.c index 1855f559..ff1431b8 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -1006,7 +1006,7 @@ static void demo_prepare_pipeline(struct demo *demo) ms.sType = VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO; ms.sampleMask = 1; ms.multisampleEnable = VK_FALSE; - ms.samples = 1; + ms.rasterSamples = 1; // Two stages: vs and fs pipeline.stageCount = 2; diff --git a/include/vulkan.h b/include/vulkan.h index eaab4a1f..4e1265ae 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -1742,7 +1742,7 @@ typedef struct VkPipelineMsStateCreateInfo_ { VkStructureType sType; // Must be VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO const void* pNext; // Pointer to next structure - uint32_t samples; + uint32_t rasterSamples; bool32_t multisampleEnable; // optional (GL45) bool32_t sampleShadingEnable; // optional (GL45) float minSampleShading; // optional (GL45) diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 783ef912..0c0265be 100644 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -631,7 +631,7 @@ static uint32_t getNumSamples(const VkPipeline pipeline) PIPELINE_NODE* pPipe = pipelineMap[pipeline]; if (VK_STRUCTURE_TYPE_PIPELINE_MS_STATE_CREATE_INFO == pPipe->msStateCI.sType) { if (pPipe->msStateCI.multisampleEnable) - return pPipe->msStateCI.samples; + return pPipe->msStateCI.rasterSamples; } return 1; } |