diff --git a/demos/CubeMapping/src/main.cpp b/demos/CubeMapping/src/main.cpp index cfef5810850f71b756e5b17ad323b9ce016795d2..19c210d8dad1141f9a76019d2662911ebeb68a46 100644 --- a/demos/CubeMapping/src/main.cpp +++ b/demos/CubeMapping/src/main.cpp @@ -208,7 +208,7 @@ int main(int argc, const char** argv) { vkcv::ImageConfig cubemapConfig (negx.w, negx.h); 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(1, negx.data.data()); cubemapImage.fillLayer(2, posy.data.data()); diff --git a/demos/NormalMapping/src/main.cpp b/demos/NormalMapping/src/main.cpp index c3483cfc3517b56f9d34aa501b438897bcfca10e..ae896a3b5f6117e3626e04fb3a73ff4c1afd4687 100644 --- a/demos/NormalMapping/src/main.cpp +++ b/demos/NormalMapping/src/main.cpp @@ -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 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()); - 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()); vkcv::SamplerHandle sampler = vkcv::samplerLinear(core); diff --git a/framework b/framework index 68955e55e1406d28006fa5696f11d10c987b8530..393809b4e6e8c0e5fa79e8501ceb3cc31462c9fd 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 68955e55e1406d28006fa5696f11d10c987b8530 +Subproject commit 393809b4e6e8c0e5fa79e8501ceb3cc31462c9fd