Skip to content
Snippets Groups Projects
Verified Commit d4183b16 authored by Tobias Frisch's avatar Tobias Frisch
Browse files

Correct texture format and update framework

parent c15bd821
No related branches found
No related tags found
No related merge requests found
...@@ -208,7 +208,7 @@ int main(int argc, const char** argv) { ...@@ -208,7 +208,7 @@ int main(int argc, const char** argv) {
vkcv::ImageConfig cubemapConfig (negx.w, negx.h); vkcv::ImageConfig cubemapConfig (negx.w, negx.h);
cubemapConfig.setCubeMapImage(true); cubemapConfig.setCubeMapImage(true);
vkcv::Image cubemapImage = vkcv::image(core, vk::Format::eR8G8B8A8Srgb, cubemapConfig); vkcv::Image cubemapImage = vkcv::image(core, vk::Format::eR8G8B8A8Unorm, cubemapConfig);
cubemapImage.fillLayer(0, posx.data.data()); cubemapImage.fillLayer(0, posx.data.data());
cubemapImage.fillLayer(1, negx.data.data()); cubemapImage.fillLayer(1, negx.data.data());
cubemapImage.fillLayer(2, posy.data.data()); cubemapImage.fillLayer(2, posy.data.data());
......
...@@ -203,10 +203,10 @@ int main(int argc, const char** argv) { ...@@ -203,10 +203,10 @@ int main(int argc, const char** argv) {
vkcv::asset::Texture diffusemap = vkcv::asset::loadTexture("../../resources/normalmapping/diffusemap.png"); vkcv::asset::Texture diffusemap = vkcv::asset::loadTexture("../../resources/normalmapping/diffusemap.png");
vkcv::asset::Texture normalmap = vkcv::asset::loadTexture("../../resources/normalmapping/normalmap.png"); vkcv::asset::Texture normalmap = vkcv::asset::loadTexture("../../resources/normalmapping/normalmap.png");
vkcv::Image diffusemapImage = vkcv::image(core, vk::Format::eR8G8B8A8Srgb, diffusemap.w, diffusemap.h); vkcv::Image diffusemapImage = vkcv::image(core, vk::Format::eR8G8B8A8Unorm, diffusemap.w, diffusemap.h);
diffusemapImage.fill(diffusemap.data.data()); diffusemapImage.fill(diffusemap.data.data());
vkcv::Image normalmapImage = vkcv::image(core, vk::Format::eR8G8B8A8Srgb, normalmap.w, normalmap.h); vkcv::Image normalmapImage = vkcv::image(core, vk::Format::eR8G8B8A8Unorm, normalmap.w, normalmap.h);
normalmapImage.fill(normalmap.data.data()); normalmapImage.fill(normalmap.data.data());
vkcv::SamplerHandle sampler = vkcv::samplerLinear(core); vkcv::SamplerHandle sampler = vkcv::samplerLinear(core);
......
Subproject commit 68955e55e1406d28006fa5696f11d10c987b8530 Subproject commit 393809b4e6e8c0e5fa79e8501ceb3cc31462c9fd
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment