Skip to content

Commit 9ed5aee

Browse files
committed
ah IES was not added to asset manager, also correct some aspectMask subresource bitflags to not trigger asserts, update examples_tests submodule
1 parent 0110f98 commit 9ed5aee

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

examples_tests

src/nbl/asset/IAssetManager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
#endif
8585

8686
#include "nbl/asset/interchange/CBufferLoaderBIN.h"
87-
//#include "nbl/asset/interchange/CIESProfileLoader.h"
87+
#include "nbl/asset/interchange/CIESProfileLoader.h"
8888

8989
#include "nbl/asset/utils/CGeometryCreator.h"
9090

@@ -181,7 +181,7 @@ void IAssetManager::addLoadersAndWriters()
181181
#ifdef _NBL_COMPILE_WITH_GLI_WRITER_
182182
addAssetWriter(core::make_smart_refctd_ptr<asset::CGLIWriter>(core::smart_refctd_ptr<system::ISystem>(m_system)));
183183
#endif
184-
// addAssetLoader(core::make_smart_refctd_ptr<asset::CIESProfileLoader>());
184+
addAssetLoader(core::make_smart_refctd_ptr<asset::CIESProfileLoader>());
185185

186186
for (auto& loader : m_loaders.vector)
187187
loader->initialize();

src/nbl/asset/utils/CIESProfile.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ core::smart_refctd_ptr<asset::ICPUImageView> CIESProfile::createIESTexture(Execu
136136
region.imageSubresource.baseArrayLayer = 0u;
137137
region.imageSubresource.layerCount = 1u;
138138
region.imageSubresource.mipLevel = 0u;
139+
region.imageSubresource.aspectMask = core::bitflag(asset::IImage::EAF_COLOR_BIT);
139140
region.bufferImageHeight = 0u;
140141
region.bufferOffset = 0u;
141142

@@ -152,7 +153,7 @@ core::smart_refctd_ptr<asset::ICPUImageView> CIESProfile::createIESTexture(Execu
152153

153154
CFillImageFilter::state_type state;
154155
state.outImage = outImg.get();
155-
state.subresource.aspectMask = static_cast<IImage::E_ASPECT_FLAGS>(0);
156+
state.subresource.aspectMask = core::bitflag(asset::IImage::EAF_COLOR_BIT);
156157
state.subresource.baseArrayLayer = 0u;
157158
state.subresource.layerCount = 1u;
158159
state.outRange.extent = creationParams.extent;
@@ -199,7 +200,7 @@ core::smart_refctd_ptr<asset::ICPUImageView> CIESProfile::createIESTexture(Execu
199200
viewParams.flags = static_cast<ICPUImageView::E_CREATE_FLAGS>(0);
200201
viewParams.viewType = IImageView<ICPUImage>::ET_2D;
201202
viewParams.format = viewParams.image->getCreationParameters().format;
202-
viewParams.subresourceRange.aspectMask = static_cast<IImage::E_ASPECT_FLAGS>(0);
203+
viewParams.subresourceRange.aspectMask = core::bitflag(asset::IImage::EAF_COLOR_BIT);
203204
viewParams.subresourceRange.levelCount = viewParams.image->getCreationParameters().mipLevels;
204205
viewParams.subresourceRange.layerCount = 1u;
205206

0 commit comments

Comments
 (0)