Remove libpng and zlib dependencies, add copyrights
diff --git a/tests/_vktracereplay.ps1 b/tests/_vktracereplay.ps1
index 622f934..d77b252 100644
--- a/tests/_vktracereplay.ps1
+++ b/tests/_vktracereplay.ps1
@@ -23,7 +23,7 @@
cp ..\..\vktrace\$dPath\vkreplay.exe .
cp ..\..\vktrace\$dPath\vktrace.exe .
cp ..\..\demos\$dPath\cube.exe .
-cp ..\..\demos\*.png .
+cp ..\..\demos\*.ppm .
cp ..\..\demos\*.spv .
cp ..\..\loader\$dPath\vulkan-0.dll .
cp ..\..\layers\$dPath\VKLayerScreenShot.dll .
diff --git a/tests/vktestframework.cpp b/tests/vktestframework.cpp
index a3df472..0d88091 100644
--- a/tests/vktestframework.cpp
+++ b/tests/vktestframework.cpp
@@ -27,7 +27,9 @@
#include <limits.h>
#include <math.h>
#include <wand/MagickWand.h>
+#ifndef _WIN32
#include <xcb/xcb.h>
+#endif
#include "vk_ext_khr_swapchain.h"
#include "vk_ext_khr_device_swapchain.h"
@@ -156,7 +158,9 @@
std::list<VkTestImageRecord>::iterator m_display_image;
void Display();
+#ifndef _WIN32
void HandleEvent(xcb_generic_event_t *event);
+#endif
};
#ifndef _WIN32
@@ -324,7 +328,7 @@
ASSERT_TRUE(file.is_open()) << "Unable to open file: " << filename;
file << "P6\n";
- file << displayImage.width() << "\n";
+ file << displayImage.width() << " ";
file << displayImage.height() << "\n";
file << 255 << "\n";
diff --git a/tests/vktracereplay.sh b/tests/vktracereplay.sh
index f53f91d..96618ed 100755
--- a/tests/vktracereplay.sh
+++ b/tests/vktracereplay.sh
@@ -20,7 +20,7 @@
cp ../../vktrace/vktrace .
cp ../../vktrace/libvktrace_layer.so .
cp ../../demos/cube .
-cp ../../demos/*png .
+cp ../../demos/*ppm .
cp ../../demos/*spv .
export LD_LIBRARY_PATH=`pwd`/../loader:$LD_LIBRARY_PATH
export VK_LAYER_PATH=`pwd`/../../layers