From d4183b16bea12cc6b1524e488ba15c4fda9ba9e0 Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Fri, 14 Oct 2022 10:54:54 +0200
Subject: [PATCH] Correct texture format and update framework
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
demos/CubeMapping/src/main.cpp | 2 +-
demos/NormalMapping/src/main.cpp | 4 ++--
framework | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/demos/CubeMapping/src/main.cpp b/demos/CubeMapping/src/main.cpp
index cfef581..19c210d 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 c3483cf..ae896a3 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 68955e5..393809b 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 68955e55e1406d28006fa5696f11d10c987b8530
+Subproject commit 393809b4e6e8c0e5fa79e8501ceb3cc31462c9fd
--
GitLab