Merge pull request #558 from AnastaZIuk/shader_pipeline

Fix compile flags on radeon rays

Author: devshgraphicsprogramming

3rdparty/CMakeLists.txt

@@ -34,6 +34,7 @@ update_git_submodule(./openssl)
 update_git_submodule(./libjpeg-turbo)
 update_git_submodule(./libjpeg) # soon to be killed
 update_git_submodule(./parallel-hashmap)
+update_git_submodule(./gli)
 # exceptions that get automatically cloned
 update_git_submodule(./glm)
 update_git_submodule(./freetype2)
@@ -454,6 +455,9 @@ if (IRR_COMPILE_WITH_CUDA)
 endif()
 
 set(IRR_3RDPARTY_TARGETS
+				RadeonRays
+				CLW
+				Calc
 				lzma
 				lz4
 				aesGladman
@@ -507,4 +511,4 @@ install(
 	DIRECTORY ./parallel-hashmap/parallel_hashmap 
 	DESTINATION ./relwithdebinfo/include/parallel-hashmap
 	CONFIGURATIONS RelWithDebInfo
-)
+)

examples_tests/22.RaytracedAO/dirty_source/ExtraCrap.cpp

@@ -3,6 +3,7 @@
 #include "ExtraCrap.h"
 
 #include "irr/ext/ScreenShot/ScreenShot.h"
+#include "../common.glsl"
 //#include "irr/ext/MitsubaLoader/CMitsubaLoader.h"
 
 
@@ -1228,4 +1229,4 @@ void Renderer::render(irr::ITimer* timer)
 		m_driver->blitRenderTargets(tmpTonemapBuffer, m_colorBuffer, false, false, {}, {}, true);
 		m_driver->setViewPort(oldVP);
 	}
-}
+}