Skip to content
This repository has been archived by the owner on Mar 31, 2023. It is now read-only.

Updated for VS2019. Data path updated to find resources. #25

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated for VS2019. Data path updated to find resources. #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/.vs
/Project/build
4 changes: 2 additions & 2 deletions Project/Tutorials/03/Tutorial03.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ namespace ApiWithoutSecrets {
}

bool Tutorial03::CreatePipeline() {
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/03/shader.vert.spv" );
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/03/shader.frag.spv" );
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "../Data/Tutorials/03/shader.vert.spv" );
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "../Data/Tutorials/03/shader.frag.spv" );

if( !vertex_shader_module || !fragment_shader_module ) {
return false;
Expand Down
4 changes: 2 additions & 2 deletions Project/Tutorials/04/Tutorial04.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ namespace ApiWithoutSecrets {
}

bool Tutorial04::CreatePipeline() {
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/04/shader.vert.spv" );
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/04/shader.frag.spv" );
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "../Data/Tutorials/04/shader.vert.spv" );
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "../Data/Tutorials/04/shader.frag.spv" );

if( !vertex_shader_module || !fragment_shader_module ) {
return false;
Expand Down
4 changes: 2 additions & 2 deletions Project/Tutorials/05/Tutorial05.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ namespace ApiWithoutSecrets {
}

bool Tutorial05::CreatePipeline() {
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/05/shader.vert.spv" );
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/05/shader.frag.spv" );
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "../Data/Tutorials/05/shader.vert.spv" );
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "../Data/Tutorials/05/shader.frag.spv" );

if( !vertex_shader_module || !fragment_shader_module ) {
return false;
Expand Down
6 changes: 3 additions & 3 deletions Project/Tutorials/06/Tutorial06.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ namespace ApiWithoutSecrets {

bool Tutorial06::CreateTexture() {
int width = 0, height = 0, data_size = 0;
std::vector<char> texture_data = Tools::GetImageData( "Data/Tutorials/06/texture.png", 4, &width, &height, nullptr, &data_size );
std::vector<char> texture_data = Tools::GetImageData( "../Data/Tutorials/06/texture.png", 4, &width, &height, nullptr, &data_size );
if( texture_data.size() == 0 ) {
return false;
}
Expand Down Expand Up @@ -605,8 +605,8 @@ namespace ApiWithoutSecrets {
}

bool Tutorial06::CreatePipeline() {
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/06/shader.vert.spv" );
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/06/shader.frag.spv" );
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "../Data/Tutorials/06/shader.vert.spv" );
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "../Data/Tutorials/06/shader.frag.spv" );

if( !vertex_shader_module || !fragment_shader_module ) {
return false;
Expand Down
6 changes: 3 additions & 3 deletions Project/Tutorials/07/Tutorial07.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ namespace ApiWithoutSecrets {

bool Tutorial07::CreateTexture() {
int width = 0, height = 0, data_size = 0;
std::vector<char> texture_data = Tools::GetImageData( "Data/Tutorials/07/texture.png", 4, &width, &height, nullptr, &data_size );
std::vector<char> texture_data = Tools::GetImageData( "../Data/Tutorials/07/texture.png", 4, &width, &height, nullptr, &data_size );
if( texture_data.size() == 0 ) {
return false;
}
Expand Down Expand Up @@ -738,8 +738,8 @@ namespace ApiWithoutSecrets {
}

bool Tutorial07::CreatePipeline() {
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "Data/Tutorials/07/shader.vert.spv" );
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "Data/Tutorials/07/shader.frag.spv" );
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> vertex_shader_module = CreateShaderModule( "../Data/Tutorials/07/shader.vert.spv" );
Tools::AutoDeleter<VkShaderModule, PFN_vkDestroyShaderModule> fragment_shader_module = CreateShaderModule( "../Data/Tutorials/07/shader.frag.spv" );

if( !vertex_shader_module || !fragment_shader_module ) {
return false;
Expand Down
2 changes: 1 addition & 1 deletion Project/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ echo Preparing 'IntroductionToVulkan' solution...
mkdir build
cd build

cmake.exe .. -DUSE_PLATFORM=VK_USE_PLATFORM_WIN32_KHR -G "Visual Studio 15 2017 Win64"
cmake.exe .. -DUSE_PLATFORM=VK_USE_PLATFORM_WIN32_KHR -G "Visual Studio 16 2019" -DARCHITECTURE=x64

start "" "IntroductionToVulkan.sln"

Expand Down