diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-04-09 11:43:10 -0600 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2015-04-16 17:48:18 +0800 |
| commit | eb4754f37ff5d69c2ee4f5820e4cd2a7fac3e05f (patch) | |
| tree | e98a5995e2b34d9700de62542396f11658ec7449 | |
| parent | 847174d87cc5bf5c8e423ae30d8d23f50410b48b (diff) | |
| download | usermoji-eb4754f37ff5d69c2ee4f5820e4cd2a7fac3e05f.tar.xz | |
xgl.h v70. Fix for vkUpdateDescriptors. Bug 13615
git-svn-id: https://cvs.khronos.org/svn/repos/oglc/trunk/nextgen/XGL@30104 e7fa87d3-cd2b-0410-9028-fcbf551c1848
| -rw-r--r-- | demos/cube.c | 2 | ||||
| -rw-r--r-- | demos/tri.c | 2 | ||||
| -rw-r--r-- | include/vulkan.h | 4 | ||||
| -rw-r--r-- | layers/draw_state.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/demos/cube.c b/demos/cube.c index bea67ee1..df58990d 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -1543,7 +1543,7 @@ static void demo_prepare_descriptor_set(struct demo *demo) view_info[i].view = demo->textures[i].view, view_info[i].layout = VK_IMAGE_LAYOUT_GENERAL; - combined_info[i].pSampler = demo->textures[i].sampler; + combined_info[i].sampler = demo->textures[i].sampler; combined_info[i].pImageView = &view_info[i]; } diff --git a/demos/tri.c b/demos/tri.c index a1553c8d..cfb7f391 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -1111,7 +1111,7 @@ static void demo_prepare_descriptor_set(struct demo *demo) view_info[i].view = demo->textures[i].view, view_info[i].layout = VK_IMAGE_LAYOUT_GENERAL; - combined_info[i].pSampler = demo->textures[i].sampler; + combined_info[i].sampler = demo->textures[i].sampler; combined_info[i].pImageView = &view_info[i]; } diff --git a/include/vulkan.h b/include/vulkan.h index 8f13f9ab..b1bdac1d 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -33,7 +33,7 @@ #include "vkPlatform.h" // Vulkan API version supported by this file -#define VK_API_VERSION VK_MAKE_VERSION(0, 69, 0) +#define VK_API_VERSION VK_MAKE_VERSION(0, 70, 0) #ifdef __cplusplus extern "C" @@ -1546,7 +1546,7 @@ typedef struct _VK_UPDATE_SAMPLERS typedef struct _VK_SAMPLER_IMAGE_VIEW_INFO { - VK_SAMPLER pSampler; + VK_SAMPLER sampler; const VK_IMAGE_VIEW_ATTACH_INFO* pImageView; } VK_SAMPLER_IMAGE_VIEW_INFO; diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 407a0903..53ec6cd4 100644 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -1176,7 +1176,7 @@ static void dsCoreDumpDot(const VK_DESCRIPTOR_SET ds, FILE* pOutFile) break; case VK_STRUCTURE_TYPE_UPDATE_SAMPLER_TEXTURES: pUST = (VK_UPDATE_SAMPLER_TEXTURES*)pSet->ppDescriptors[i]; - pSCI = getSamplerCreateInfo(pUST->pSamplerImageViews[i-pUST->arrayIndex].pSampler); + pSCI = getSamplerCreateInfo(pUST->pSamplerImageViews[i-pUST->arrayIndex].sampler); if (pSCI) { sprintf(tmp_str, "SAMPLER%u", i); fprintf(pOutFile, "%s", vk_gv_print_vk_sampler_create_info(pSCI, tmp_str)); |