vktrace_wayland.patch

   1 diff -dur -x '*.orig' -x '*.rej' -x '*~' VulkanTools-sdk-1.0.32.0.orig/api_dump_generator.py VulkanTools-sdk-1.0.32.0/api_dump_generator.py
   2 --- VulkanTools-sdk-1.0.32.0.orig/api_dump_generator.py 2016-11-10 18:52:27.000000000 +0100
   3 +++ VulkanTools-sdk-1.0.32.0/api_dump_generator.py      2016-11-23 14:38:41.000000000 +0100
   4 @@ -676,7 +676,7 @@
   5  }}
   6  """
   7
   8 -POINTER_TYPES = ['void', 'xcb_connection_t', 'Display', 'SECURITY_ATTRIBUTES', 'ANativeWindow']
   9 +POINTER_TYPES = ['void', 'xcb_connection_t', 'Display', 'SECURITY_ATTRIBUTES', 'ANativeWindow', 'wl_surface', 'wl_display']
  10  VALIDITY_CHECKS = {
  11      'VkBufferCreateInfo': {
  12          'pQueueFamilyIndices': 'object.sharingMode == VK_SHARING_MODE_CONCURRENT',
  13 @@ -1433,4 +1433,4 @@
  14          return {
  15              'unName': self.name,
  16          }
  17 -
  18 \ No newline at end of file
  19 +
  20 diff -dur -x '*.orig' -x '*.rej' -x '*~' VulkanTools-sdk-1.0.32.0.orig/vk_helper_api_dump.py VulkanTools-sdk-1.0.32.0/vk_helper_api_dump.py
  21 --- VulkanTools-sdk-1.0.32.0.orig/vk_helper_api_dump.py 2016-11-10 18:52:27.000000000 +0100
  22 +++ VulkanTools-sdk-1.0.32.0/vk_helper_api_dump.py      2016-11-23 14:45:42.000000000 +0100
  23 @@ -1468,7 +1468,7 @@
  24                      elif is_type(self.struct_dict[s][m]['type'], 'struct'):
  25                          sh_funcs.append('%sstructSize += %s(pStruct->%s);' % (indent, self._get_size_helper_func_name(self.struct_dict[s][m]['type']), self.struct_dict[s][m]['name']))
  26                      elif 'void' not in self.struct_dict[s][m]['type'].lower():
  27 -                        if (self.struct_dict[s][m]['type'] != 'xcb_connection_t'):
  28 +                        if (self.struct_dict[s][m]['type'] not in ('xcb_connection_t', 'struct wl_display', 'struct wl_surface')):
  29                              sh_funcs.append('%sstructSize += sizeof(%s);' % (indent, self.struct_dict[s][m]['type']))
  30                  elif 'size_t' == self.struct_dict[s][m]['type'].lower():
  31                      sh_funcs.append('%sstructSize += pStruct->%s;' % (indent, self.struct_dict[s][m]['name']))
  32 diff -dur -x '*.orig' -x '*.rej' -x '*~' VulkanTools-sdk-1.0.32.0.orig/vk_helper.py VulkanTools-sdk-1.0.32.0/vk_helper.py
  33 --- VulkanTools-sdk-1.0.32.0.orig/vk_helper.py  2016-11-10 18:52:27.000000000 +0100
  34 +++ VulkanTools-sdk-1.0.32.0/vk_helper.py       2016-11-23 14:45:42.000000000 +0100
  35 @@ -1424,7 +1424,7 @@
  36                      elif is_type(self.struct_dict[s][m]['type'], 'struct'):
  37                          sh_funcs.append('%sstructSize += %s(pStruct->%s);' % (indent, self._get_size_helper_func_name(self.struct_dict[s][m]['type']), self.struct_dict[s][m]['name']))
  38                      elif 'void' not in self.struct_dict[s][m]['type'].lower():
  39 -                        if (self.struct_dict[s][m]['type'] != 'xcb_connection_t'):
  40 +                        if (self.struct_dict[s][m]['type'] not in ('xcb_connection_t', 'struct wl_display', 'struct wl_surface')):
  41                              sh_funcs.append('%sstructSize += sizeof(%s);' % (indent, self.struct_dict[s][m]['type']))
  42                  elif 'size_t' == self.struct_dict[s][m]['type'].lower():
  43                      sh_funcs.append('%sstructSize += pStruct->%s;' % (indent, self.struct_dict[s][m]['name']))
  44 diff -dur -x '*.orig' -x '*.rej' -x '*~' VulkanTools-sdk-1.0.32.0.orig/vktrace/src/vktrace_layer/vktrace_lib_trace.cpp VulkanTools-sdk-1.0.32.0/vktrace/src/vktrace_layer/vktrace_lib_trace.cpp
  45 --- VulkanTools-sdk-1.0.32.0.orig/vktrace/src/vktrace_layer/vktrace_lib_trace.cpp       2016-11-10 18:52:27.000000000 +0100
  46 +++ VulkanTools-sdk-1.0.32.0/vktrace/src/vktrace_layer/vktrace_lib_trace.cpp    2016-11-23 14:45:42.000000000 +0100
  47 @@ -1885,6 +1885,36 @@
  48  #endif
  49
  50  //TODO Wayland and Mir support
  51 +#ifdef VK_USE_PLATFORM_WAYLAND_KHR
  52 +VKTRACER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL __HOOKED_vkCreateWaylandSurfaceKHR(
  53 +    VkInstance                                  instance,
  54 +    const VkWaylandSurfaceCreateInfoKHR*        pCreateInfo,
  55 +    const VkAllocationCallbacks*                pAllocator,
  56 +    VkSurfaceKHR*                               pSurface)
  57 +{
  58 +    VkResult result;
  59 +
  60 +    // TODO: Implement.
  61 +
  62 +    result = mid(instance)->instTable.CreateWaylandSurfaceKHR(instance, pCreateInfo, pAllocator, pSurface);
  63 +
  64 +    return result;
  65 +}
  66 +
  67 +VKTRACER_EXPORT VKAPI_ATTR VkBool32 VKAPI_CALL __HOOKED_vkGetPhysicalDeviceWaylandPresentationSupportKHR(
  68 +    VkPhysicalDevice                            physicalDevice,
  69 +    uint32_t                                    queueFamilyIndex,
  70 +    struct wl_display*                          display)
  71 +{
  72 +    VkBool32 result;
  73 +
  74 +    // TODO: Implement.
  75 +
  76 +    result = mid(physicalDevice)->instTable.GetPhysicalDeviceWaylandPresentationSupportKHR(physicalDevice, queueFamilyIndex, display);
  77 +
  78 +    return result;
  79 +}
  80 +#endif
  81
  82  /* TODO: Probably want to make this manual to get the result of the boolean and then check it on replay
  83  VKTRACER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL __HOOKED_vkGetPhysicalDeviceSurfaceSupportKHR(