WIP

Author: hoffstadt-nasa

dependencies/imgui/imgui_impl_vulkan.cpp

@@ -980,6 +980,7 @@ bool ImGui_ImplVulkan_CreateDeviceObjects()
         info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
         info.bindingCount = 1;
         info.pBindings = &binding;
+        info.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT;
         err = vkCreateDescriptorSetLayout(v->Device, &info, bd->Allocator, &bd->TextureDescriptorSetLayout);
         check_vk_result(err);
     }
@@ -994,6 +995,7 @@ bool ImGui_ImplVulkan_CreateDeviceObjects()
         info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
         info.bindingCount = 1;
         info.pBindings = &binding;
+        info.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT;
         err = vkCreateDescriptorSetLayout(v->Device, &info, bd->Allocator, &bd->SamplerDescriptorSetLayout);
         check_vk_result(err);
     }
@@ -1004,7 +1006,7 @@ bool ImGui_ImplVulkan_CreateDeviceObjects()
     pool_sizes[1] = { VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, 1 };
     VkDescriptorPoolCreateInfo pool_info = {};
     pool_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
-    pool_info.flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT;
+    pool_info.flags = VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT | VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT;
     pool_info.maxSets = 2;
     pool_info.poolSizeCount = 2;
     pool_info.pPoolSizes = pool_sizes;

docs/version.txt

@@ -82,17 +82,17 @@ the API is complete. It just means we won't break what currently exists.
 * Compression         v1.0.0 (pl_compress_ext.h)
 * Virtual File System v1.0.0 (pl_vfs_ext.h)
 * ECS                 v1.0.0 (pl_ecs_ext.h)
+* DDS                 v1.0.0 (pl_dds_ext.h)
+* Resource            v1.0.0 (pl_resource_ext.h)
 
 ## Nearly Stable Extensions
 
-* Resource            v0.2.2 (pl_resource_ext.h)
 * Bvh                 v0.2.0 (pl_bvh_ext.h)
 * Physics             v0.2.0 (pl_physics_ext.h)
 * Collision           v0.2.0 (pl_collision_ext.h)
 * Mesh                v0.1.0 (pl_mesh_ext.h)
 * Mesh Builder        v0.1.0 (pl_mesh_ext.h)
 * Shader Variant      v0.2.0 (pl_shader_variant_ext.h)
-* DDS                 v0.2.0 (pl_dds_ext.h)
 
 ## Unstable Extensions
 

editor/app.c

@@ -476,9 +476,9 @@ pl_app_load(plApiRegistryI* ptApiRegistry, plAppData* ptAppData)
     gptRenderer->load_skybox_from_panorama(ptAppData->ptScene, "/environments/helipad.hdr", 1024);
 
     plModelLoaderData tLoaderData0 = {0};
-    // gptModelLoader->load_gltf(ptAppData->ptComponentLibrary, "/models/gltf/humanoid/model.gltf", NULL, &tLoaderData0);
-    gptModelLoader->load_gltf(ptAppData->ptComponentLibrary, "/models/gltf/humanoid/floor.gltf", NULL, &tLoaderData0);
-    // gptModelLoader->load_gltf(ptAppData->ptComponentLibrary, "/gltf/Sponza/glTF/Sponza.gltf", NULL, &tLoaderData0);
+    gptModelLoader->load_gltf(ptAppData->ptComponentLibrary, "/models/gltf/humanoid/model.gltf", NULL, &tLoaderData0);
+    // gptModelLoader->load_gltf(ptAppData->ptComponentLibrary, "/models/gltf/humanoid/floor.gltf", NULL, &tLoaderData0);
+    gptModelLoader->load_gltf(ptAppData->ptComponentLibrary, "/gltf/Sponza/glTF/Sponza.gltf", NULL, &tLoaderData0);
     // gptModelLoader->load_gltf(ptAppData->ptComponentLibrary, "/models/gltf/sort.gltf", NULL, &tLoaderData0);
     // plMat4 tRotation = pl_mat4_rotate_xyz(-PL_PI_2, 0.0f, 1.0f, 0.0f);
     // gptModelLoader->load_gltf(ptAppData->ptComponentLibrary, "/gltf/CarConcept/glTF/CarConcept.gltf", &tRotation, &tLoaderData0);
@@ -488,7 +488,8 @@ pl_app_load(plApiRegistryI* ptApiRegistry, plAppData* ptAppData)
     // gptModelLoader->load_gltf(ptAppData->ptComponentLibrary, "/gltf/TextureTransformTest/glTF/TextureTransformTest.gltf", NULL, &tLoaderData0);
     // gptModelLoader->load_gltf(ptAppData->ptComponentLibrary, "/gltf/TextureTransformMultiTest/glTF/TextureTransformMultiTest.gltf", NULL, &tLoaderData0);
     // gptModelLoader->load_gltf(ptAppData->ptComponentLibrary, "/gltf/TransmissionTest/glTF/TransmissionTest.gltf", NULL, &tLoaderData0);
-    gptModelLoader->load_gltf(ptAppData->ptComponentLibrary, "/gltf/DamagedHelmet/glTF/DamagedHelmet.gltf", NULL, &tLoaderData0);
+    // gptModelLoader->load_gltf(ptAppData->ptComponentLibrary, "/gltf/DamagedHelmet/glTF/DamagedHelmet.gltf", NULL, &tLoaderData0);
+    // gptModelLoader->load_gltf(ptAppData->ptComponentLibrary, "/gltf/BoxTextured/glTF/BoxTextured.gltf", NULL, &tLoaderData0);
     gptRenderer->add_drawable_objects_to_scene(ptAppData->ptScene, tLoaderData0.uObjectCount, tLoaderData0.atObjects);
     gptModelLoader->free_data(&tLoaderData0);
     gptRenderer->finalize_scene(ptAppData->ptScene);

editor/editor.cpp

@@ -162,6 +162,7 @@ pl_app_load(plApiRegistryI* ptApiRegistry, plAppData* ptAppData)
     gptVfs->mount_directory("/shaders", "../shaders", PL_VFS_MOUNT_FLAGS_NONE);
     gptVfs->mount_directory("/shader-temp", "../shader-temp", PL_VFS_MOUNT_FLAGS_NONE);
     gptFile->create_directory("../shader-temp");
+    gptFile->create_directory("../cache");
 
     // defaults
     ptAppData->tSelectedEntity.uData = UINT64_MAX;

extensions/pl_dds_ext.h

@@ -55,7 +55,7 @@ Index of this file:
 // [SECTION] APIs
 //-----------------------------------------------------------------------------
 
-#define plDdsI_version {0, 2, 0}
+#define plDdsI_version {1, 0, 0}
 
 //-----------------------------------------------------------------------------
 // [SECTION] includes

extensions/pl_model_loader_ext.c

@@ -424,6 +424,7 @@ pl__load_gltf_texture(const char* pcPath, plTextureSlot tSlot, const cgltf_textu
 
         pl_str_get_file_name_only(ptTexture->texture->image->mime_type, pcNext, 4);
         strcpy(ptMaterial->atTextureMaps[tSlot].acName, acResourceName);
+        // ptMaterial->atTextureMaps[tSlot].tResource = gptResource->load_ex(acResourceName, PL_RESOURCE_LOAD_FLAG_BLOCK_COMPRESSED, (uint8_t*)pucActualBuffer, ptTexture->texture->image->buffer_view->size, pcPath, 0);
         ptMaterial->atTextureMaps[tSlot].tResource = gptResource->load_ex(acResourceName, PL_RESOURCE_LOAD_FLAG_BLOCK_COMPRESSED, (uint8_t*)pucActualBuffer, ptTexture->texture->image->buffer_view->size, pcPath, 0);
     }
     else if(strncmp(ptTexture->texture->image->uri, "data:", 5) == 0)
@@ -457,7 +458,6 @@ pl__load_gltf_texture(const char* pcPath, plTextureSlot tSlot, const cgltf_textu
         char acFilepath[2048] = {0};
         strcpy(acFilepath, pcDirectory);
         pl_str_concatenate(acFilepath, ptMaterial->atTextureMaps[tSlot].acName, acFilepath, 2048);
-        // ptMaterial->atTextureMaps[tSlot].tResource = gptResource->load(acFilepath, PL_RESOURCE_LOAD_FLAG_BLOCK_COMPRESSED);
         ptMaterial->atTextureMaps[tSlot].tResource = gptResource->load(acFilepath, PL_RESOURCE_LOAD_FLAG_BLOCK_COMPRESSED);
     }
 }