diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2017-03-01 19:03:17 -0800 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-03-13 11:16:33 +0000 |
| commit | 12f348bc987991f7014996841c5e37887bcae228 (patch) | |
| tree | 7f922d2d848bd0c44218751b0cd5f36b90a2b4ef /src/vulkan/wsi | |
| parent | 1d135e25617b2e321b7ebe5c443d3d6d191dee90 (diff) | |
vulkan/wsi: Generate wayland protocol headers separately from EGL
Previously, we were depending on EGL for generating the headers and
providing the protocol symbols. However, since neither Vulkan driver
actually wants to link against EGL, this is kind of pointless. It also
creates a weird build dependency.
v2 [Jason]
- Add missing wsi/ prefix, MKDIR_GEN
v3 [Emil Velikov]
- include BUILT_SOURCES/generation rules outside of conditional
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Diffstat (limited to 'src/vulkan/wsi')
| -rw-r--r-- | src/vulkan/wsi/.gitignore | 2 | ||||
| -rw-r--r-- | src/vulkan/wsi/wsi_common_wayland.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/vulkan/wsi/.gitignore b/src/vulkan/wsi/.gitignore new file mode 100644 index 00000000000..0b7b71bb666 --- /dev/null +++ b/src/vulkan/wsi/.gitignore @@ -0,0 +1,2 @@ +wayland-drm-client-protocol.h +wayland-drm-protocol.c diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c index 67ac0b8372e..2e47183b9d2 100644 --- a/src/vulkan/wsi/wsi_common_wayland.c +++ b/src/vulkan/wsi/wsi_common_wayland.c @@ -22,7 +22,6 @@ */ #include <wayland-client.h> -#include <wayland-drm-client-protocol.h> #include <assert.h> #include <stdlib.h> @@ -33,6 +32,7 @@ #include <pthread.h> #include "wsi_common_wayland.h" +#include "wayland-drm-client-protocol.h" #include <util/hash_table.h> #include <util/u_vector.h> |