make the barycentrics actually get used

devshgraphicsprogramming · devshgraphicsprogramming · commit 35d5fb416a31 · 2021-07-01T07:06:23.000+02:00
and fix 3rdparty issues (SPIRV-Tools is now an alias, needed to account for that)
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -471,7 +471,7 @@ set(NBL_3RDPARTY_TARGETS
 				SPIRV 
 				Iex
 				IexMath
-				SPIRV-Tools
+				SPIRV-Tools-static
 				SPIRV-Tools-opt )
 #TODO insert more targets that are conditionally built
 if (NBL_BUILD_MITSUBA_LOADER)
diff --git a/3rdparty/SPIRV-Headers b/3rdparty/SPIRV-Headers
@@ -1 +1 @@
-Subproject commit f027d53ded7e230e008d37c8b47ede7cd308e19d
+Subproject commit ddf3230c14c71e81fc0eae9b781cc4bcc2d1f0f5
diff --git a/examples_tests/22.RaytracedAO/fillVisBuffer.frag b/examples_tests/22.RaytracedAO/fillVisBuffer.frag
@@ -3,6 +3,7 @@
 // For conditions of distribution and use, see copyright notice in nabla.h
 #version 430 core
 #extension GL_EXT_shader_16bit_storage : require
+#include <nbl/builtin/glsl/barycentric/extensions.glsl>
 
 
 #define _NBL_GLSL_EXT_MITSUBA_LOADER_INSTANCE_DATA_BINDING_ 0
diff --git a/examples_tests/41.VisibilityBuffer/fillVBuffer.frag b/examples_tests/41.VisibilityBuffer/fillVBuffer.frag
@@ -1,4 +1,5 @@
 #version 430 core
+#include <nbl/builtin/glsl/barycentric/frag.glsl>
 
 #include "common.glsl"
 
diff --git a/include/nbl/builtin/glsl/barycentric/extensions.glsl b/include/nbl/builtin/glsl/barycentric/extensions.glsl
@@ -2,11 +2,11 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
-#ifndef _NBL_BUILTIN_GLSL_EXTENSIONS_INCLUDED_
-#define _NBL_BUILTIN_GLSL_EXTENSIONS_INCLUDED_
+#ifndef _NBL_BUILTIN_GLSL_BARYCENTRIC_EXTENSIONS_INCLUDED_
+#define _NBL_BUILTIN_GLSL_BARYCENTRIC_EXTENSIONS_INCLUDED_
 
 #ifdef NBL_GL_NV_fragment_shader_barycentric
-#extension GL_NV_fragment_shader_barycentric : enable
+#extension GL_NV_fragment_shader_barycentric : require
 #elif defined(NBL_GL_AMD_shader_explicit_vertex_parameter)
 #extension GL_AMD_shader_explicit_vertex_parameter : enable
 #endif
diff --git a/src/nbl/CMakeLists.txt b/src/nbl/CMakeLists.txt
@@ -507,7 +507,7 @@ endif()
 nbl_install_lib(shaderc)
 nbl_install_lib(shaderc_util)
 nbl_install_lib(SPIRV)
-nbl_install_lib(SPIRV-Tools)
+nbl_install_lib(SPIRV-Tools-static) # TODO: make this function/macro work with alias target
 nbl_install_lib(SPIRV-Tools-opt)
 nbl_install_lib(OGLCompiler)
 nbl_install_lib(OSDependent)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#version 430 core`
	`2`	`+#include <nbl/builtin/glsl/barycentric/frag.glsl>`
`2`	`3`
`3`	`4`	`#include "common.glsl"`
`4`	`5`