Add an example using a SPIR-V 1.1 header.

Also update the README to show use of 1.1 SPIR-V headers
with 1.0 extended instruction sets.

diff --git a/README.md b/README.md
index 226c8c4..6f1b6f2 100644 (file)
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ A CMake-based project can use the headers without installing, as follows:
 ```
 #include "spirv/1.0/GLSL.std.450.h"
 #include "spirv/1.0/OpenCL.std.h"
-#include "spirv/1.0/spirv.hpp"
+#include "spirv/1.1/spirv.hpp"
 ```
 
 See also the [example](example/) subdirectory.  But since that example is

diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index 8b22f60..dff65d9 100644 (file)
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -2,3 +2,8 @@ add_library(SPIRV-Headers-example
        ${CMAKE_CURRENT_SOURCE_DIR}/example.cpp)
 target_include_directories(SPIRV-Headers-example
        PRIVATE ${SPIRV-Headers_SOURCE_DIR}/include)
+
+add_library(SPIRV-Headers-example-1.1
+       ${CMAKE_CURRENT_SOURCE_DIR}/example-1.1.cpp)
+target_include_directories(SPIRV-Headers-example-1.1
+       PRIVATE ${SPIRV-Headers_SOURCE_DIR}/include)

diff --git a/example/example-1.1.cpp b/example/example-1.1.cpp
new file mode 100644 (file)
index 0000000..989d35c
--- /dev/null
+++ b/example/example-1.1.cpp
@@ -0,0 +1,42 @@
+// Copyright (c) 2016 The Khronos Group Inc.
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and/or associated documentation files (the
+// "Materials"), to deal in the Materials without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Materials, and to
+// permit persons to whom the Materials are furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Materials.
+// 
+// MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS
+// KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS
+// SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT
+//    https://www.khronos.org/registry/
+// 
+// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+// MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+
+// Use the SPIR-V 1.1 core instruction set, but with 1.0 versions
+// of the GLSL and OpenCL extended instruction sets.
+#include <spirv/1.0/GLSL.std.450.h>
+#include <spirv/1.0/OpenCL.std.h>
+#include <spirv/1.1/spirv.hpp>
+
+namespace {
+
+const GLSLstd450 kSin = GLSLstd450Sin;
+const OpenCLLIB::Entrypoints kNative_cos = OpenCLLIB::Native_cos;
+const spv::Op kNop = spv::OpNop;
+
+// This instruction is new in SPIR-V 1.1.
+const spv::Op kNamedBarrierInit = spv::OpNamedBarrierInitialize;
+
+}  // anonymous namespace