Update VulkanTest demo

This commit is contained in:
Lynix 2020-05-11 14:12:38 +02:00
parent 6a23d51147
commit 77186ba456
5 changed files with 21 additions and 2 deletions

View File

@ -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);

View File

@ -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

View File

@ -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;
}