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

diff --git a/demos/cube.c b/demos/cube.c
index bea67ee..df58990 100644 (file)
--- 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 a1553c8..cfb7f39 100644 (file)
--- 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 8f13f9a..b1bdac1 100644 (file)
--- 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 407a090..53ec6cd 100644 (file)
--- 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));