Commit f8684fd2 authored by Dajo Frey's avatar Dajo Frey

(maintenance) update dependencies

parent 7c4832bd
TEST SYSTEMS
--
1. Intel i3 5005U, integrated (Arch Linux, Vulkan 1.1.106 release Apr 2019, 8GB RAM)
2. NVIDIA GTX 1070 (Windows 10, Vulkan 1.1.121 release Sep 2019, 16GB RAM, Intel Core i5-7600K)
3. AMD Radeon R9 390 (Arch Linux, Vulkan 1.1.113 release Jul 2019, 64GB RAM, AMD Ryzen 9 3900X)
4. NVIDIA GTX 1080 TI (Windows 10, Vulkan 1.1.109 release May 2019, 32 GB RAM, Intel Core i7-6700K)
5. NVIDI RTX 2080 TI (Window 10, Vulkan 1.1.99 release February 2019, 64 GB RAM, Into Core i7-7800X)
-----------------------
RAYTRACING PERFORMANCE TEST (dragon sphere-packing)
--
1 2 3 4 5
5k, no acceleration : NULL Seconds 0.398 Seconds 0.25 Seconds 0.181 Seconds 0.093 Seconds
50k, no acceleration : NULL Seconds 1.904 Seconds 1.86 Seconds 1.321 Seconds 0.531 Seconds
100k, no acceleration: NULL Seconds 3.560 Seconds 3.69 Seconds 2.871 Seconds 0.687 Seconds
150k, no acceleration: NULL Seconds 5.970 Seconds 5.60 Seconds 4.380 Seconds 1.000 Seconds
200k, no acceleration: NULL Seconds 8.990 Seconds 8.08 Seconds 5.297 Seconds 2.375 Seconds
250k, no acceleration: NULL Seconds 9.990 Seconds 11.4 Seconds 7.206 Seconds 2.796 Seconds
300k, no acceleration: NULL Seconds 11.72 Seconds 14.1 Seconds 8.705 Seconds 5.296 Seconds
1 2 3 4 5
5k, bvh : NULL Seconds 0.030 Seconds 0.10 Seconds 0.038 Seconds 0.015 Seconds
50k, bvh : NULL Seconds 0.130 Seconds 0.22 Seconds 0.105 Seconds 0.078 Seconds
100k, bvh: NULL Seconds 0.336 Seconds 0.56 Seconds 0.175 Seconds 0.109 Seconds
150k, bvh: NULL Seconds 0.575 Seconds 0.75 Seconds 0.315 Seconds 0.078 Seconds
200k, bvh: NULL Seconds 0.926 Seconds 1.23 Seconds 0.525 Seconds 0.109 Seconds
250k, bvh: NULL Seconds 1.307 Seconds 1.77 Seconds 0.872 Seconds 0.359 Seconds
300k, bvh: NULL Seconds 1.390 Seconds 2.05 Seconds 1.151 Seconds 0.422 Seconds
1 2 3 4 5
5k, grid : NULL Seconds 0.052 Seconds 0.14 Seconds 0.029 Seconds 0.015 Seconds
50k, grid : NULL Seconds 0.270 Seconds 0.34 Seconds 0.179 Seconds 0.047 Seconds
100k, grid: NULL Seconds 0.518 Seconds 0.72 Seconds 0.322 Seconds 0.078 Seconds
150k, grid: NULL Seconds 0.767 Seconds 1.15 Seconds 0.489 Seconds 0.110 Seconds
200k, grid: NULL Seconds 1.149 Seconds 1.67 Seconds 0.750 Seconds 0.141 Seconds
250k, grid: NULL Seconds 1.489 Seconds 2.17 Seconds 1.077 Seconds 0.266 Seconds
300k, grid: NULL Seconds 2.560 Seconds 2.84 Seconds 1.321 Seconds 0.437 Seconds
---------------------------
PATHTRACING PERFORMANCE TEST (pig sphere-packing, 16 samples)
--
1 2 3 4 5
2k, no acceleration : 37.2 Seconds 3.000 Seconds TODO Seconds 2.40 Seconds 0.93 Seconds
5k, no acceleration : 100. Seconds 7.460 Seconds TODO Seconds 5.55 Seconds 1.18 Seconds
10k, no acceleration : NULL Seconds 14.82 Seconds TODO Seconds 11.0 Seconds 2.25 Seconds
20k, no acceleration : NULL Seconds 29.40 Seconds TODO Seconds 23.0 Seconds 4.16 Seconds
30k, no acceleration : NULL Seconds 43.96 Seconds TODO Seconds 33.0 Seconds 6.15 Seconds
40k, no acceleration : NULL Seconds 62.45 Seconds TODO Seconds 44.0 Seconds 8.14 Seconds
50k, no acceleration : NULL Seconds 79.30 Seconds TODO Seconds 58.2 Seconds 11.9 Seconds
75k, no acceleration : NULL Seconds 353.2 Seconds TODO Seconds NULL Seconds 30.5 Seconds
100k, no acceleration: NULL Seconds 736.4 Seconds TODO Seconds NULL Seconds 54.1 Seconds
1 2 3 4 5
2k, bvh : 8.90 Seconds 0.98 Seconds TODO Seconds 0.362 Seconds 0.249 Seconds
5k, bvh : 10.8 Seconds 1.43 Seconds TODO Seconds 0.463 Seconds 0.562 Seconds
10k, bvh : 21.5 Seconds 2.18 Seconds TODO Seconds 0.681 Seconds 0.563 Seconds
20k, bvh : 34.4 Seconds 4.03 Seconds TODO Seconds 2.305 Seconds 0.953 Seconds
30k, bvh : 45.7 Seconds 5.83 Seconds TODO Seconds 2.486 Seconds 1.390 Seconds
40k, bvh : 59.4 Seconds 8.61 Seconds TODO Seconds 2.989 Seconds 1.719 Seconds
50k, bvh : 78.5 Seconds 9.34 Seconds TODO Seconds 4.704 Seconds 1.971 Seconds
75k, bvh : NULL Seconds 13.64 Seconds TODO Seconds 6.616 Seconds 2.925 Seconds
100k, bvh: NULL Seconds 19.28 Seconds TODO Seconds 8.731 Seconds 3.609 Seconds
---------------------------
METABALLS PERFORMANCE TEST (dragon sphere-packing, 1.39 Thresh)
--
3 5
2k, 9.01 Seconds 2.13 Seconds
5K, 16.4 Seconds 4.63 Seconds
10K, 22.3 Seconds 11.1 Seconds
......@@ -49,9 +49,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${BIN_DIRECTORY})
#########################
if (WIN32)
add_definitions(-DVK_VERSION_1_1 -DVK_USE_PLATFORM_WIN32_KHR -DVK_KHR_win32_surface)
add_definitions(-DVK_VERSION_1_2 -DVK_USE_PLATFORM_WIN32_KHR -DVK_KHR_win32_surface)
elseif (UNIX)
add_definitions(-DVK_VERSION_1_1 -DVK_USE_PLATFORM_XLIB_KHR -DVK_KHR_xlib_surface)
add_definitions(-DVK_VERSION_1_2 -DVK_USE_PLATFORM_XLIB_KHR -DVK_KHR_xlib_surface)
endif (WIN32)
add_definitions(-DVOLK_VULKAN_H_PATH="../../deps/Vulkan-Headers/include/vulkan/vulkan.h")
......
Subproject commit ba091ba6a947f79623b28fe8bfccdce1ab9fa467
Subproject commit db06fce926b0fa5034ed8be30e84fce6fc645e83
Subproject commit 56cbacd9f6dc1f2020ea02d9660bfb65e87a3ac1
Subproject commit a2985aa444265ad991433db20cb38f108ceaf633
Subproject commit cde83f9fe8fcb7547d2bde65d95baa34096ce920
Subproject commit c1f0030b20488a940f0813f413d84313652bb0b2
Subproject commit bf5fc02a0405987f2fa5beb8824a0c6c0c4b5429
Subproject commit 79c7627887a9de3775fe80fc316dfb716c226c70
......@@ -162,13 +162,13 @@ PR_BEGIN()
}
if (deviceCount == 1) {
const char *devices2[] = {devices[0]};
igCombo("##lab20", &RenderTask_p->DeviceId, devices2, deviceCount, -1);
// igCombo("##lab20", &RenderTask_p->DeviceId, devices2, deviceCount, -1);
} else if (deviceCount == 2) {
const char *devices2[] = {devices[0], devices[1]};
igCombo("##lab20", &RenderTask_p->DeviceId, devices2, deviceCount, -1);
// igCombo("##lab20", &RenderTask_p->DeviceId, devices2, deviceCount, -1);
} else if (deviceCount >= 3) {
const char *devices2[] = {devices[0], devices[1], devices[2]};
igCombo("##lab20", &RenderTask_p->DeviceId, devices2, deviceCount, -1);
// igCombo("##lab20", &RenderTask_p->DeviceId, devices2, deviceCount, -1);
}
#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
......@@ -207,7 +207,7 @@ PR_BEGIN()
strcpy(help_p, c_p);
}
igCombo("##lab1", &RenderTask_p->Settings.shader, shaders, 8, -1);
// igCombo("##lab1", &RenderTask_p->Settings.shader, shaders, 8, -1);
igText("");
igText("Pixel Chunk Size (%d px)", RenderTask_p->Stat.x * RenderTask_p->Stat.y);
......@@ -312,7 +312,7 @@ PR_BEGIN()
if (PR_p->showInfo)
{
ImVec4 textColor = {0.1, 0.1, 0.1, 1.0};
igPushStyleColor(ImGuiCol_Text, textColor);
igPushStyleColorVec4(ImGuiCol_Text, textColor);
ImVec2 topLeft = {0, 0};
igSetNextWindowPos(topLeft, 0, topLeft);
igBegin("Info", &PR_p->showGUI, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoTitleBar);
......@@ -393,7 +393,7 @@ PR_BEGIN()
// loading spheres popup
if (Instance_p->status == INSTANCE_STATUS_LOADING_SPHERES) {
igOpenPopup("Loading Spheres");
igOpenPopup("Loading Spheres", 0);
igBeginPopup("Loading Spheres", 0);
igText("Loading Spheres");
ImVec2 size = {-1.0, 0.0};
......
// 7.13.3381
0x07230203,0x00010000,0x00080007,0x00000018,0x00000000,0x00020011,0x00000001,0x0006000b,
// 8.13.3727
0x07230203,0x00010000,0x00080008,0x00000018,0x00000000,0x00020011,0x00000001,0x0006000b,
0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
0x0008000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x0000000b,0x00000014,
0x00030010,0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,
......
// 7.13.3381
0x07230203,0x00010000,0x00080007,0x0000002b,0x00000000,0x00020011,0x00000001,0x0006000b,
// 8.13.3727
0x07230203,0x00010000,0x00080008,0x0000002b,0x00000000,0x00020011,0x00000001,0x0006000b,
0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
0x000b000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000009,0x0000000b,0x0000000f,
0x00000011,0x00000015,0x00000018,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,
......
......@@ -107,7 +107,7 @@ void PR_runRenderLoop(
{
RenderTask_p = GET_RENDER_TASK(PR_p->RenderTaskIndex); // fetch current render task
Device_p = GET_DEVICE(RenderTask_p->DeviceId); // device could have change
}
}
// check if window was resized and if yes, recreate stuff
resize(Instance_p, Thread_p, Device_p, Window_p);
......@@ -185,7 +185,7 @@ void PR_runRenderLoop(
};
vkQueuePresentKHR(*VkQueue_p, &presentInfo);
printf("present!!\n");
#ifdef __unix__ // update most statistics
updateStatistics(RenderTask_p, partialTATStart);
#elif defined(_WIN32) || defined(WIN32)
......
......@@ -97,10 +97,10 @@ PR_BEGIN();
.applicationVersion = VK_MAKE_VERSION(0, 0, 0),
.pEngineName = "NULL",
.engineVersion = VK_MAKE_VERSION(0, 0, 0),
.apiVersion = VK_API_VERSION_1_1
.apiVersion = VK_API_VERSION_1_2
};
const char* instanceLayers_pp[1] = {"VK_LAYER_LUNARG_standard_validation"};
const char* instanceLayers_pp[1] = {"VK_LAYER_KHRONOS_validation"};
#ifdef __unix__
......@@ -164,7 +164,7 @@ PR_BEGIN();
.pUserData = VK_NULL_HANDLE
};
char *layerName = "VK_LAYER_LUNARG_standard_validation";
char *layerName = "VK_LAYER_KHRONOS_validation";
char *extName = "VK_EXT_debug_utils";
uint32_t propertyCount = 0;
......@@ -215,7 +215,7 @@ static PR_Result validationLayerSupported()
{
PR_BEGIN();
const char* validationLayer_pp[1] = {"VK_LAYER_LUNARG_standard_validation"};
const char* validationLayer_pp[1] = {"VK_LAYER_KHRONOS_validation"};
int layerSupported = 0;
int availableLayerCount = 0;
......@@ -255,7 +255,7 @@ static PR_Result validationExtensionSupported()
{
PR_BEGIN()
char *layerName = "VK_LAYER_LUNARG_standard_validation";
char *layerName = "VK_LAYER_KHRONOS_validation";
char *extName = "VK_EXT_debug_utils";
uint32_t propCount = 0;
......
......@@ -213,10 +213,10 @@ PR_BEGIN()
*VkPhysicalDevice_p, *VkSurfaceKHR_p, &surfaceCapabilities
);
VkExtent2D swapExtent = surfaceCapabilities.currentExtent;
if (surfaceCapabilities.minImageCount > VkWindowLink_p->numberOfFrames) {
PR_END(PR_ERROR_BAD_STATE);
}
// if (surfaceCapabilities.minImageCount > VkWindowLink_p->numberOfFrames) {
// PR_END(PR_ERROR_BAD_STATE);
// }
// create swapchain
VkSwapchainCreateInfoKHR swapchainInfo =
......@@ -247,10 +247,10 @@ PR_BEGIN()
// create swapchain images
int numberOfImages = 0;
vkGetSwapchainImagesKHR(*VkDevice_p, *VkSwapchainKHR_p, &numberOfImages, VK_NULL_HANDLE);
if (numberOfImages != VkWindowLink_p->numberOfFrames) {
PR_END(PR_ERROR_BAD_STATE);
}
// if (numberOfImages != VkWindowLink_p->numberOfFrames) {
// PR_END(PR_ERROR_BAD_STATE);
// }
#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
......
// 7.13.3381
0x07230203,0x00010000,0x00080007,0x000004a6,0x00000000,0x00020011,0x00000001,0x00020011,
// 8.13.3727
0x07230203,0x00010000,0x00080008,0x000004a6,0x00000000,0x00020011,0x00000001,0x00020011,
0x00000032,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,
0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x0000033e,
0x00060010,0x00000004,0x00000011,0x00000010,0x00000011,0x00000001,0x00030003,0x00000002,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
// 7.13.3381
0x07230203,0x00010000,0x00080007,0x000000a2,0x00000000,0x00020011,0x00000001,0x0006000b,
// 8.13.3727
0x07230203,0x00010000,0x00080008,0x000000a2,0x00000000,0x00020011,0x00000001,0x0006000b,
0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00000011,0x00030010,
0x00000004,0x00000007,0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,
......
// 7.13.3381
0x07230203,0x00010000,0x00080007,0x00000029,0x00000000,0x00020011,0x00000001,0x0006000b,
// 8.13.3727
0x07230203,0x00010000,0x00080008,0x00000029,0x00000000,0x00020011,0x00000001,0x0006000b,
0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001,
0x0008000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000009,0x0000000c,0x0000001a,
0x00030003,0x00000002,0x000001c2,0x00040005,0x00000004,0x6e69616d,0x00000000,0x00040005,
......
// 7.13.3381
0x07230203,0x00010000,0x00080007,0x000002f4,0x00000000,0x00020011,0x00000001,0x00020011,
// 8.13.3727
0x07230203,0x00010000,0x00080008,0x000002f4,0x00000000,0x00020011,0x00000001,0x00020011,
0x00000032,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,
0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x0000027b,
0x00060010,0x00000004,0x00000011,0x00000010,0x00000011,0x00000001,0x00030003,0x00000002,
......
// 7.13.3381
0x07230203,0x00010000,0x00080007,0x00000355,0x00000000,0x00020011,0x00000001,0x00020011,
// 8.13.3727
0x07230203,0x00010000,0x00080008,0x00000355,0x00000000,0x00020011,0x00000001,0x00020011,
0x00000032,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,
0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x0000027b,
0x00060010,0x00000004,0x00000011,0x00000010,0x00000011,0x00000001,0x00030003,0x00000002,
......
// 7.13.3381
0x07230203,0x00010000,0x00080007,0x0000039e,0x00000000,0x00020011,0x00000001,0x00020011,
// 8.13.3727
0x07230203,0x00010000,0x00080008,0x0000039e,0x00000000,0x00020011,0x00000001,0x00020011,
0x00000032,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,
0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x0000027b,
0x00060010,0x00000004,0x00000011,0x00000010,0x00000011,0x00000001,0x00030003,0x00000002,
......
// 7.13.3381
0x07230203,0x00010000,0x00080007,0x0000033b,0x00000000,0x00020011,0x00000001,0x00020011,
// 8.13.3727
0x07230203,0x00010000,0x00080008,0x0000033b,0x00000000,0x00020011,0x00000001,0x00020011,
0x00000032,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,
0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x000002c2,
0x00060010,0x00000004,0x00000011,0x00000010,0x00000011,0x00000001,0x00030003,0x00000002,
......
// 7.13.3381
0x07230203,0x00010000,0x00080007,0x000002f0,0x00000000,0x00020011,0x00000001,0x00020011,
// 8.13.3727
0x07230203,0x00010000,0x00080008,0x000002f0,0x00000000,0x00020011,0x00000001,0x00020011,
0x00000032,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,
0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x00000277,
0x00060010,0x00000004,0x00000011,0x00000010,0x00000011,0x00000001,0x00030003,0x00000002,
......
// 7.13.3381
0x07230203,0x00010000,0x00080007,0x00000335,0x00000000,0x00020011,0x00000001,0x00020011,
// 8.13.3727
0x07230203,0x00010000,0x00080008,0x00000335,0x00000000,0x00020011,0x00000001,0x00020011,
0x00000032,0x0006000b,0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,
0x00000000,0x00000001,0x0006000f,0x00000005,0x00000004,0x6e69616d,0x00000000,0x000002bc,
0x00060010,0x00000004,0x00000011,0x00000010,0x00000011,0x00000001,0x00030003,0x00000002,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment