From 6fd787e08f0a1e41eb04673dd4bdbc12ad152a4a Mon Sep 17 00:00:00 2001 From: AmyFoxie Date: Thu, 9 Nov 2023 20:58:09 +0100 Subject: [PATCH] fix shader loading after file structure move --- src/engine/gl/test/main.cpp | 4 ++-- src/engine/vk/test/main.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/engine/gl/test/main.cpp b/src/engine/gl/test/main.cpp index f45319a..f78aaeb 100644 --- a/src/engine/gl/test/main.cpp +++ b/src/engine/gl/test/main.cpp @@ -27,11 +27,11 @@ int main() { window.center(); window.setVisible(true); - std::ifstream vertexStream("../../editor/shaders/triangle.vert"); + std::ifstream vertexStream("../../src/editor/shaders/triangle.vert"); std::string vertexSource((std::istreambuf_iterator(vertexStream)), std::istreambuf_iterator()); auto vertexModule = std::make_shared(Vixen::ShaderModule::Stage::VERTEX, vertexSource); - std::ifstream fragmentStream("../../editor/shaders/triangle.frag"); + std::ifstream fragmentStream("../../src/editor/shaders/triangle.frag"); std::string fragmentSource((std::istreambuf_iterator(fragmentStream)), std::istreambuf_iterator()); auto fragmentModule = std::make_shared(Vixen::ShaderModule::Stage::FRAGMENT, fragmentSource); diff --git a/src/engine/vk/test/main.cpp b/src/engine/vk/test/main.cpp index ea17185..ff311b5 100644 --- a/src/engine/vk/test/main.cpp +++ b/src/engine/vk/test/main.cpp @@ -40,10 +40,10 @@ int main() { .location = 1, .offset = offsetof(Vertex, color), }) - .compileFromFile(vixen.device, "../../editor/shaders/triangle.vert"); + .compileFromFile(vixen.device, "../../src/editor/shaders/triangle.vert"); auto fragment = Vixen::Vk::VkShaderModule::Builder() .setStage(Vixen::ShaderModule::Stage::FRAGMENT) - .compileFromFile(vixen.device, "../../editor/shaders/triangle.frag"); + .compileFromFile(vixen.device, "../../src/editor/shaders/triangle.frag"); auto program = Vixen::Vk::VkShaderProgram(vertex, fragment); int width;