Fix ZIP Archive Loader and test examples 06 and 07

Author: devshgraphicsprogramming

examples_tests/07.SubpassBaking/main.cpp

@@ -146,7 +146,7 @@ class SubpassBaking : public ApplicationBase
         const auto swapchainImageUsage = static_cast<asset::IImage::E_USAGE_FLAGS>(asset::IImage::EUF_COLOR_ATTACHMENT_BIT);
         const video::ISurface::SFormat surfaceFormat(asset::EF_R8G8B8A8_SRGB, asset::ECP_SRGB, asset::EOTF_sRGB);
 
-        CommonAPI::InitWithDefaultExt(initOutput, video::EAT_OPENGL, "SubpassBaking", WIN_W, WIN_H, SC_IMG_COUNT, swapchainImageUsage, surfaceFormat, nbl::asset::EF_D32_SFLOAT);
+        CommonAPI::InitWithDefaultExt(initOutput, video::EAT_VULKAN, "SubpassBaking", WIN_W, WIN_H, SC_IMG_COUNT, swapchainImageUsage, surfaceFormat, nbl::asset::EF_D32_SFLOAT);
         window = std::move(initOutput.window);
         apiConnection = std::move(initOutput.apiConnection);
         surface = std::move(initOutput.surface);

examples_tests/Readme.md

@@ -38,7 +38,7 @@ N = No support
 | 04.Keyframe                     | S            | S                | S            | S            | S               | S            | S                 | S              |                                                   |
 | 05.NablaTutorialExample         | Y            | Y                | Y            | S            | S               | S            | S                 | S              |                                                   |
 | 06.MeshLoaders                  | Y            | Y                | Y            | S            | S               | S            | Y                 | Y              |                                                   |
-| 07.SubpassBaking                | S            | S                | S            | S            | S               | S            | S                 | S              |                                                   |
+| 07.SubpassBaking                | Y            | Y                | Y            | S            | S               | S            | S                 | S              |                                                   |
 | FREE_SLOT                       |              |                  |              |              |                 |              |                   |                |                                                   |
 | 09.ColorSpaceTest               | W            | W                | W            | W            | W               | W            | W                 | W              |                                                   |
 | 10.AllocatorTest                | Y            | Y                | Y            | S            | S               | S            | N                 | N              |                                                   |

src/nbl/system/CArchiveLoaderZip.cpp

@@ -123,7 +123,7 @@ core::smart_refctd_ptr<IFileArchive> CArchiveLoaderZip::createArchive_impl(core:
 			item.pathRelativeToArchive = _path;
 			item.size = meta.DataDescriptor.UncompressedSize;
 			item.offset = offset;
-			item.ID = items.size();
+			item.ID = itemsMetadata.size();
 			item.allocatorType = meta.CompressionMethod ? IFileArchive::EAT_VIRTUAL_ALLOC:IFileArchive::EAT_NULL;
 			itemsMetadata.push_back(meta);
 		};
@@ -232,7 +232,7 @@ core::smart_refctd_ptr<IFileArchive> CArchiveLoaderZip::createArchive_impl(core:
 				SZIPFileHeader zipHeader;
 				{
 					IFile::success_t success;
-					file->read(success,&zipHeader,0ull,sizeof(zipHeader));
+					file->read(success,&zipHeader,offset,sizeof(zipHeader));
 					if (!success)
 						break;
 					offset += success.getSizeToProcess();
@@ -393,7 +393,7 @@ CFileArchive::file_buffer_t CArchiveLoaderZip::CArchive::getFileBuffer(const IFi
 	CFileArchive::file_buffer_t retval = { nullptr,item->size,nullptr };
 	//
 	void* decrypted = nullptr;
-	size_t decryptedSize = 0ull;
+	size_t decryptedSize = header.DataDescriptor.CompressedSize;
 	auto freeOnFail = core::makeRAIIExiter([&actualCompressionMethod,&retval,&decrypted,&decryptedSize](){
 		if (decrypted && retval.buffer!=decrypted)
 		{
@@ -424,7 +424,7 @@ CFileArchive::file_buffer_t CArchiveLoaderZip::CArchive::getFileBuffer(const IFi
 			const size_t reduction = saltSize+12u;
 			if (header.DataDescriptor.CompressedSize<=reduction)
 				return retval;
-			decryptedSize = header.DataDescriptor.CompressedSize-reduction;
+			decryptedSize -= reduction;
 		}
 		mmapPtr += saltSize;
 		uint16_t& pwVerification = *reinterpret_cast<uint16_t*>(mmapPtr);