diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index b97477f28..16b51c975 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -52,6 +52,8 @@ Breaking Changes: - Before: ImGui_ImplVulkan_AddTexture(VkSampler, VkImageView, VkImageLayout) - After: ImGui_ImplVulkan_AddTexture(VkImageView, VkImageLayout) - Kept inline redirection function that ignores the sampler (will obsolete). + - Vulkan: with the change above it is now possible to change the current Sampler during + rendering, by poking into ImGui_ImplVulkan_RenderState's SamplerCurrentDS. (#914) Other Changes: @@ -124,6 +126,11 @@ Other Changes: - SDL2: made `ImGui_ImplSDL2_GetContentScaleForWindow()`/`ImGui_ImplSDL2_GetContentScaleForDisplay()` helpers return a minimum of 1.0f, as some Linux setup seems to report <1.0f value and this breaks scaling border size. (#9369) +- Examples: + - GLFW+Vulkan, SDL2+Vulkan, SDL3+Vulkan, Win32+Vulkan: reworked to create a descriptor pool with: + - IMGUI_IMPL_VULKAN_MINIMUM_SAMPLED_IMAGE_POOL_SIZE descriptors of type VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE. + - IMGUI_IMPL_VULKAN_MINIMUM_SAMPLER_POOL_SIZE descriptors of type VK_DESCRIPTOR_TYPE_SAMPLER. + ----------------------------------------------------------------------- diff --git a/examples/example_win32_vulkan/main.cpp b/examples/example_win32_vulkan/main.cpp index 7d5091045..cbdbdb830 100644 --- a/examples/example_win32_vulkan/main.cpp +++ b/examples/example_win32_vulkan/main.cpp @@ -436,12 +436,6 @@ int main(int, char**) bool show_another_window = false; ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f); - //int my_image_width = 0; - //int my_image_height = 0; - //GLuint my_image_texture = 0; - //bool ret = LoadTextureFromFile("../../MyImage01.jpg", &my_image_texture, &my_image_width, &my_image_height); - //IM_ASSERT(ret); - // Main loop bool done = false; while (!done) @@ -464,16 +458,6 @@ int main(int, char**) ImGui_ImplWin32_NewFrame(); ImGui::NewFrame(); - //ImGui::Begin("SDL_GPU Texture Test"); - //ImGui::Text("pointer = %p", &my_texture); - //ImGui::Text("size = %d x %d", my_image_width, my_image_height); - //ImGui::Image((ImTextureID)(intptr_t)my_texture, ImVec2((float)my_image_width * 3, (float)my_image_height * 3)); - //ImGui::SameLine(); - //ImGui::GetWindowDrawList()->AddCallback(ImDrawCallback_SetSamplerNearest, NULL); - //ImGui::Image((ImTextureID)(intptr_t)my_texture, ImVec2((float)my_image_width * 3, (float)my_image_height * 3)); - //ImGui::GetWindowDrawList()->AddCallback(ImDrawCallback_SetSamplerLinear, NULL); - //ImGui::End(); - // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!). if (show_demo_window) ImGui::ShowDemoWindow(&show_demo_window);