demos_out_of_src.patch

   1 diff -dur vulkan-sdk-1.0.3.0.orig/VulkanTools/demos/cube.c vulkan-sdk-1.0.3.0/VulkanTools/demos/cube.c
   2 --- vulkan-sdk-1.0.3.0.orig/VulkanTools/demos/cube.c    2016-02-22 22:02:54.000000000 +0100
   3 +++ vulkan-sdk-1.0.3.0/VulkanTools/demos/cube.c 2016-02-25 08:15:38.000000000 +0100
   4 @@ -28,6 +28,8 @@
   5   * Author: Jon Ashburn <jon@lunarg.com>
   6   */
   7
   8 +#define DEMO_DATA_DIR "/usr/share/vulkan-sdk-demos"
   9 +
  10  #define _GNU_SOURCE
  11  #include <stdio.h>
  12  #include <stdlib.h>
  13 @@ -115,7 +117,7 @@
  14      int32_t tex_width, tex_height;
  15  };
  16
  17 -static char *tex_files[] = {"lunarg.ppm"};
  18 +static char *tex_files[] = {DEMO_DATA_DIR "/lunarg.ppm"};
  19
  20  struct vkcube_vs_uniform {
  21      // Must start with MVP
  22 @@ -1478,7 +1480,7 @@
  23      void *vertShaderCode;
  24      size_t size;
  25
  26 -    vertShaderCode = demo_read_spv("cube-vert.spv", &size);
  27 +    vertShaderCode = demo_read_spv(DEMO_DATA_DIR "/cube-vert.spv", &size);
  28
  29      demo->vert_shader_module =
  30          demo_prepare_shader_module(demo, vertShaderCode, size);
  31 @@ -1492,7 +1494,7 @@
  32      void *fragShaderCode;
  33      size_t size;
  34
  35 -    fragShaderCode = demo_read_spv("cube-frag.spv", &size);
  36 +    fragShaderCode = demo_read_spv(DEMO_DATA_DIR "/cube-frag.spv", &size);
  37
  38      demo->frag_shader_module =
  39          demo_prepare_shader_module(demo, fragShaderCode, size);
  40 diff -dur vulkan-sdk-1.0.3.0.orig/VulkanTools/demos/tri.c vulkan-sdk-1.0.3.0/VulkanTools/demos/tri.c
  41 --- vulkan-sdk-1.0.3.0.orig/VulkanTools/demos/tri.c     2016-02-22 22:02:54.000000000 +0100
  42 +++ vulkan-sdk-1.0.3.0/VulkanTools/demos/tri.c  2016-02-25 08:14:22.000000000 +0100
  43 @@ -35,6 +35,8 @@
  44   * should.  It also does no error checking.
  45   */
  46
  47 +#define DEMO_DATA_DIR "/usr/share/vulkan-sdk-demos"
  48 +
  49  #ifndef _MSC_VER
  50  #define _ISOC11_SOURCE /* for aligned_alloc() */
  51  #endif
  52 @@ -1229,7 +1231,7 @@
  53      void *vertShaderCode;
  54      size_t size;
  55
  56 -    vertShaderCode = demo_read_spv("tri-vert.spv", &size);
  57 +    vertShaderCode = demo_read_spv(DEMO_DATA_DIR "/tri-vert.spv", &size);
  58
  59      demo->vert_shader_module =
  60          demo_prepare_shader_module(demo, vertShaderCode, size);
  61 @@ -1243,7 +1245,7 @@
  62      void *fragShaderCode;
  63      size_t size;
  64
  65 -    fragShaderCode = demo_read_spv("tri-frag.spv", &size);
  66 +    fragShaderCode = demo_read_spv(DEMO_DATA_DIR "/tri-frag.spv", &size);
  67
  68      demo->frag_shader_module =
  69          demo_prepare_shader_module(demo, fragShaderCode, size);