diff options
| author | Cody Northrop <cody@lunarg.com> | 2015-08-24 15:11:10 -0600 |
|---|---|---|
| committer | Cody Northrop <cody@lunarg.com> | 2015-08-26 09:59:59 -0600 |
| commit | a9e2194cf4a89a3115cc7c9522597531ab17df75 (patch) | |
| tree | 2fe41ca1f9c09fb2ce201000eda3ece7b7df8a79 | |
| parent | f50f551dd485d031afd54b81cead4322131ca50b (diff) | |
| download | usermoji-a9e2194cf4a89a3115cc7c9522597531ab17df75.tar.xz | |
v154: Bug 14417 - Added VkShaderStage to VkShaderCreateInfo
| -rw-r--r-- | demos/cube.c | 2 | ||||
| -rw-r--r-- | demos/tri.c | 2 | ||||
| -rw-r--r-- | include/vulkan.h | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/demos/cube.c b/demos/cube.c index 0e68e006..5fa60007 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -1446,6 +1446,7 @@ static VkShader demo_prepare_shader(struct demo* demo, shaderCreateInfo.flags = 0; shaderCreateInfo.module = *pShaderModule; shaderCreateInfo.pName = "main"; + shaderCreateInfo.stage = stage; err = vkCreateShader(demo->device, &shaderCreateInfo, &shader); } else { // Create fake SPV structure to feed GLSL @@ -1468,6 +1469,7 @@ static VkShader demo_prepare_shader(struct demo* demo, shaderCreateInfo.flags = 0; shaderCreateInfo.module = *pShaderModule; shaderCreateInfo.pName = "main"; + shaderCreateInfo.stage = stage; err = vkCreateShader(demo->device, &shaderCreateInfo, &shader); } return shader; diff --git a/demos/tri.c b/demos/tri.c index 615e5241..ffc19cd5 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -1084,6 +1084,7 @@ static VkShader demo_prepare_shader(struct demo *demo, shaderCreateInfo.flags = 0; shaderCreateInfo.module = *pShaderModule; shaderCreateInfo.pName = "main"; + shaderCreateInfo.stage = stage; err = vkCreateShader(demo->device, &shaderCreateInfo, &shader); assert(!err); } else { @@ -1107,6 +1108,7 @@ static VkShader demo_prepare_shader(struct demo *demo, shaderCreateInfo.flags = 0; shaderCreateInfo.module = *pShaderModule; shaderCreateInfo.pName = "main"; + shaderCreateInfo.stage = stage; err = vkCreateShader(demo->device, &shaderCreateInfo, &shader); assert(!err); } diff --git a/include/vulkan.h b/include/vulkan.h index f8a7e86c..010123dd 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -41,7 +41,7 @@ extern "C" { ((major << 22) | (minor << 12) | patch) // Vulkan API version supported by this file -#define VK_API_VERSION VK_MAKE_VERSION(0, 153, 0) +#define VK_API_VERSION VK_MAKE_VERSION(0, 154, 0) #if defined(__cplusplus) && (_MSC_VER >= 1800 || __cplusplus >= 201103L) @@ -1566,6 +1566,7 @@ typedef struct { VkShaderModule module; const char* pName; VkShaderCreateFlags flags; + VkShaderStage stage; } VkShaderCreateInfo; typedef struct { |