Merge pull request #543 from buildaworldnet/property_pool

Property Pool, Extension Headers&Source Movement and Minor Fixes

Author: devshgraphicsprogramming

CMakeLists.txt

@@ -251,8 +251,6 @@ if(IRR_BUILD_TOOLS)
 	add_subdirectory(tools) # convert2BAW
 endif()
 
-add_subdirectory(ext)
-
 if(IRR_BUILD_EXAMPLES)
 	add_subdirectory(examples_tests)
 endif()

examples_tests/03.GPU_Mesh/main.cpp

@@ -6,7 +6,7 @@
 //! I advise to check out this file, its a basic input handler
 #include "../common/QToQuitEventReceiver.h"
 
-//#include "../../ext/ScreenShot/ScreenShot.h"
+//#include "irr/ext/ScreenShot/ScreenShot.h"
 
 
 using namespace irr;

examples_tests/06.MeshLoaders/main.cpp

@@ -5,9 +5,9 @@
 
 //! I advise to check out this file, its a basic input handler
 #include "../common/QToQuitEventReceiver.h"
-#include "../../ext/FullScreenTriangle/FullScreenTriangle.h"
+#include "irr/ext/FullScreenTriangle/FullScreenTriangle.h"
 
-//#include "../../ext/ScreenShot/ScreenShot.h"
+//#include "irr/ext/ScreenShot/ScreenShot.h"
 
 
 using namespace irr;

examples_tests/07.HardwareSkinning/main.cpp

@@ -1,7 +1,7 @@
 #define _IRR_STATIC_LIB_
 #include <irrlicht.h>
 
-#include "../../ext/ScreenShot/ScreenShot.h"
+#include "irr/ext/ScreenShot/ScreenShot.h"
 
 #include "../common/QToQuitEventReceiver.h"
 

examples_tests/08.HardwareInstancing/bin/screenshot.png

@@ -0,0 +1,26 @@
+#version 430 core
+
+#include "common.glsl"
+
+layout(local_size_x = kOptimalWorkgroupSize) in;
+
+layout(set = 0, binding = 0, std430) restrict readonly buffer WorldParams
+{
+    uint drawData[];
+} world;
+layout(set = 0, binding = 1, std430) restrict writeonly buffer CameraParams
+{
+    uint drawData[];
+} camera;
+
+layout(push_constant, row_major) uniform PushConstants
+{
+    uint drawDataArrayDWORDSize;
+} pc;
+
+void main()
+{
+    uint dword = gl_GlobalInvocationID.x;
+    if (dword<drawDataArrayDWORDSize)
+        camera.drawData[dword] = world.drawData[dword];
+}

examples_tests/08.HardwareInstancing/clearCameraDrawcalls.comp

@@ -0,0 +1,13 @@
+#define kOptimalWorkgroupSize 256u
+
+// structs
+//
+
+#ifndef __cplusplus
+#include <irr/builtin/glsl/utils/common.glsl>
+#include <irr/builtin/glsl/utils/transform.glsl>
+
+#include <irr/builtin/glsl/utils/indirect_commands.glsl>
+
+#include <irr/builtin/glsl/utils/culling.glsl>
+#endif

examples_tests/08.HardwareInstancing/common.glsl

@@ -0,0 +1,10 @@
+#version 430 core
+
+#include "common.glsl"
+
+layout(local_size_x = kOptimalWorkgroupSize) in;
+
+
+void main()
+{
+}

examples_tests/08.HardwareInstancing/cullObjects.comp

@@ -0,0 +1,10 @@
+#version 430 core
+
+#include "common.glsl"
+
+layout(local_size_x = kOptimalWorkgroupSize) in;
+
+
+void main()
+{
+}