From 77186ba4564b164463555d76433b9ee8382b2fbc Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Mon, 11 May 2020 14:12:38 +0200
Subject: [PATCH] Update VulkanTest demo

---
 examples/VulkanTest/main.cpp                  |  18 ++++++++++++++++++
 .../bin/resources/shaders/spirv-triangle.bat  |   4 ++--
 .../bin/resources/shaders/triangle.frag.spv   | Bin 1296 -> 1296 bytes
 examples/bin/resources/shaders/triangle.vert  |   1 +
 .../bin/resources/shaders/triangle.vert.spv   | Bin 1640 -> 1912 bytes
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/examples/VulkanTest/main.cpp b/examples/VulkanTest/main.cpp
index 1411ac0ab..c777a65b2 100644
--- a/examples/VulkanTest/main.cpp
+++ b/examples/VulkanTest/main.cpp
@@ -3,6 +3,8 @@
 #include <array>
 #include <iostream>
 
+#define SPIRV 0
+
 int main()
 {
 	Nz::Initializer<Nz::Renderer> loader;
@@ -27,6 +29,7 @@ int main()
 
 	std::shared_ptr<Nz::RenderDevice> device = window.GetRenderDevice();
 
+#if SPIRV
 	auto fragmentShader = device->InstantiateShaderStage(Nz::ShaderStageType::Fragment, Nz::ShaderLanguage::SpirV, "resources/shaders/triangle.frag.spv");
 	if (!fragmentShader)
 	{
@@ -40,6 +43,21 @@ int main()
 		std::cout << "Failed to instantiate fragment shader" << std::endl;
 		return __LINE__;
 	}
+#else
+	auto fragmentShader = device->InstantiateShaderStage(Nz::ShaderStageType::Fragment, Nz::ShaderLanguage::GLSL, "resources/shaders/triangle.frag");
+	if (!fragmentShader)
+	{
+		std::cout << "Failed to instantiate fragment shader" << std::endl;
+		return __LINE__;
+	}
+
+	auto vertexShader = device->InstantiateShaderStage(Nz::ShaderStageType::Vertex, Nz::ShaderLanguage::GLSL, "resources/shaders/triangle.vert");
+	if (!vertexShader)
+	{
+		std::cout << "Failed to instantiate fragment shader" << std::endl;
+		return __LINE__;
+	}
+#endif
 
 	Nz::MeshRef drfreak = Nz::Mesh::LoadFromFile("resources/Spaceship/spaceship.obj", meshParams);
 
diff --git a/examples/bin/resources/shaders/spirv-triangle.bat b/examples/bin/resources/shaders/spirv-triangle.bat
index 0459876df..af7bd2eda 100644
--- a/examples/bin/resources/shaders/spirv-triangle.bat
+++ b/examples/bin/resources/shaders/spirv-triangle.bat
@@ -1,3 +1,3 @@
-glslangvalidator -V triangle.vert -o triangle.vert.spv
-glslangvalidator -V triangle.frag -o triangle.frag.spv
+glslangvalidator -V triangle.vert -o triangle.vert.spv --client opengl100
+glslangvalidator -V triangle.frag -o triangle.frag.spv --client opengl100
 
diff --git a/examples/bin/resources/shaders/triangle.frag.spv b/examples/bin/resources/shaders/triangle.frag.spv
index 31ec5000f7bdb18687d5c03d343ffa25591f85d6..855cf613abcacf778f7aa6a6e5a9c4483ac84a76 100644
GIT binary patch
delta 23
ecmbQhHGzwhnMs+Qfq{{MV<KlfBge+f<tzXz>;ydk

delta 23
ecmbQhHGzwhnMs+Qfq{{MaUy3tBm2h8<tzXzp#(Jm

diff --git a/examples/bin/resources/shaders/triangle.vert b/examples/bin/resources/shaders/triangle.vert
index b967590b8..de648f231 100644
--- a/examples/bin/resources/shaders/triangle.vert
+++ b/examples/bin/resources/shaders/triangle.vert
@@ -28,4 +28,5 @@ void main()
 	outNormal = inNormals;
 	outTexCoords = inTexCoord;
 	gl_Position = ubo.projectionMatrix * ubo.viewMatrix * ubo.modelMatrix * vec4(inPos, 1.0);
+	gl_Position.y = -gl_Position.y;
 }
diff --git a/examples/bin/resources/shaders/triangle.vert.spv b/examples/bin/resources/shaders/triangle.vert.spv
index a9b99027fe2cd62c93903fe9b86116b313870e56..58b0936f4f765cd7332585bf21b61883de859675 100644
GIT binary patch
delta 318
zcmaFC^Mj9<nMs+Qfq{{M0|;#<@|rU8PIT5}wPIjku-=%N&#1}Dz{&vPrRT(lr52T>
zR(QGqMc5duA!43+#U+V($*G<$o3ApuGs?O%uz;0w1EpDk7{muD1@YN7OEMp3j1>h6
z83DNpKnw!fP`)vc%?QK_K)wl(W(Hz5DBluDgXF}4*cvDg;)7fT5`*zU)-Z0q$<of4
z;t13TGQt#y#ei4>h(X5N0=0sSGy`IgTs@R;4i$sxvjFmu_1OU(0}=zN`wO(x0*C>@
C3LwD%

delta 54
zcmeyt_kxF)nMs+Qfq@YSIT(y4@|rSoPjuGYSdzoInTN@RadQFl0mjV}SX&r5{sNU)
G05JePoeSCk