commit f39b3eced1fa20fd588c0a55e0aef4adc2205f7b
author Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Apr 09 11:43:10 2015 -0600
committer Chia-I Wu <olv@lunarg.com> Thu Apr 16 17:48:18 2015 +0800
tree 7e29bcab45291f2dd9480ed3d0e692190e1060a9
parent dba799895629a839664d538c6d72039a0263d346

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

include/vulkan.h

diff --git a/include/vulkan.h b/include/vulkan.h
index 8f13f9a..b1bdac1 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_SAMPLER_IMAGE_VIEW_INFO
 {
-    VK_SAMPLER                                  pSampler;
+    VK_SAMPLER                                  sampler;
     const VK_IMAGE_VIEW_ATTACH_INFO*            pImageView;
 } VK_SAMPLER_IMAGE_VIEW_INFO;
 

layers/draw_state.cpp

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 407a090..53ec6cd 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -1176,7 +1176,7 @@
                             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));

tests/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 9acd5f3..bec384e 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -313,7 +313,7 @@
     m_type_counts.push_back(tc);
 
     VK_SAMPLER_IMAGE_VIEW_INFO tmp = {};
-    tmp.pSampler = sampler->obj();
+    tmp.sampler = sampler->obj();
     tmp.pImageView = &texture->m_textureViewInfo;
     m_samplerTextureInfo.push_back(tmp);