Examples: DirectX9 example cleanup to match DirectX11 structure.

examples/directx11_example/imgui_impl_dx11.cpp

@@ -180,7 +180,7 @@ LRESULT ImGui_ImplDX11_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM
     return 0;
 }
 
-static void ImGui_ImplDX11_InitFontsTexture()
+static void ImGui_ImplDX11_CreateFontsTexture()
 {
     ImGuiIO& io = ImGui::GetIO();
 
@@ -359,7 +359,7 @@ bool    ImGui_ImplDX11_CreateDeviceObjects()
             return false;
     }
 
-    ImGui_ImplDX11_InitFontsTexture();
+    ImGui_ImplDX11_CreateFontsTexture();
 
     return true;
 }

examples/directx9_example/imgui_impl_dx9.cpp

@@ -13,7 +13,6 @@
 static HWND                     g_hWnd = 0;
 static INT64                    g_Time = 0;
 static INT64                    g_TicksPerSecond = 0;
-static bool                     g_FontTextureLoaded = false;
 static LPDIRECT3DDEVICE9        g_pd3dDevice = NULL;
 static LPDIRECT3DVERTEXBUFFER9  g_pVB = NULL;
 
@@ -145,37 +144,6 @@ LRESULT ImGui_ImplDX9_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM
     return 0;
 }
 
-void ImGui_ImplDX9_InitFontsTexture()
-{
-    ImGuiIO& io = ImGui::GetIO();
-
-    // Build
-    unsigned char* pixels;
-    int width, height, bytes_per_pixel;
-    io.Fonts->GetTexDataAsAlpha8(&pixels, &width, &height, &bytes_per_pixel);
-
-    // Create DX9 texture
-    LPDIRECT3DTEXTURE9 pTexture = NULL;
-    if (D3DXCreateTexture(g_pd3dDevice, width, height, 1, D3DUSAGE_DYNAMIC, D3DFMT_A8, D3DPOOL_DEFAULT, &pTexture) < 0)
-    {
-        IM_ASSERT(0);
-        return;
-    }
-    D3DLOCKED_RECT tex_locked_rect;
-    if (pTexture->LockRect(0, &tex_locked_rect, NULL, 0) != D3D_OK) 
-    {	
-        IM_ASSERT(0); 
-        return; 
-    }
-    for (int y = 0; y < height; y++)
-        memcpy((unsigned char *)tex_locked_rect.pBits + tex_locked_rect.Pitch * y, pixels + (width * bytes_per_pixel) * y, (width * bytes_per_pixel));
-    pTexture->UnlockRect(0);
-
-    // Store our identifier
-    io.Fonts->TexID = (void *)pTexture;
-    g_FontTextureLoaded = true;
-}
-
 bool    ImGui_ImplDX9_Init(void* hwnd, IDirect3DDevice9* device)
 {
     g_hWnd = (HWND)hwnd;
@@ -214,44 +182,76 @@ bool    ImGui_ImplDX9_Init(void* hwnd, IDirect3DDevice9* device)
     return true;
 }
 
-void ImGui_ImplDX9_InvalidateDeviceObjects()
+void ImGui_ImplDX9_Shutdown()
 {
-    if (!g_pd3dDevice)
-        return;
-    if (g_pVB)
+    ImGui_ImplDX9_InvalidateDeviceObjects();
+    ImGui::Shutdown();
+    g_pd3dDevice = NULL;
+    g_hWnd = 0;
+}
+
+static void ImGui_ImplDX9_CreateFontsTexture()
+{
+    ImGuiIO& io = ImGui::GetIO();
+
+    // Build
+    unsigned char* pixels;
+    int width, height, bytes_per_pixel;
+    io.Fonts->GetTexDataAsAlpha8(&pixels, &width, &height, &bytes_per_pixel);
+
+    // Create DX9 texture
+    LPDIRECT3DTEXTURE9 pTexture = NULL;
+    if (D3DXCreateTexture(g_pd3dDevice, width, height, 1, D3DUSAGE_DYNAMIC, D3DFMT_A8, D3DPOOL_DEFAULT, &pTexture) < 0)
     {
-        g_pVB->Release();
-        g_pVB = NULL;
+        IM_ASSERT(0);
+        return;
     }
-    if (LPDIRECT3DTEXTURE9 tex = (LPDIRECT3DTEXTURE9)ImGui::GetIO().Fonts->TexID)
+    D3DLOCKED_RECT tex_locked_rect;
+    if (pTexture->LockRect(0, &tex_locked_rect, NULL, 0) != D3D_OK) 
     {	
-        tex->Release();
-        ImGui::GetIO().Fonts->TexID = 0;
+        IM_ASSERT(0); 
+        return; 
     }
+    for (int y = 0; y < height; y++)
+        memcpy((unsigned char *)tex_locked_rect.pBits + tex_locked_rect.Pitch * y, pixels + (width * bytes_per_pixel) * y, (width * bytes_per_pixel));
+    pTexture->UnlockRect(0);
+
+    // Store our identifier
+    io.Fonts->TexID = (void *)pTexture;
 }
 
-void ImGui_ImplDX9_CreateDeviceObjects()
+bool ImGui_ImplDX9_CreateDeviceObjects()
 {
     if (!g_pd3dDevice)
-        return;
+        return false;
+
     if (g_pd3dDevice->CreateVertexBuffer(10000 * sizeof(CUSTOMVERTEX), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, D3DFVF_CUSTOMVERTEX, D3DPOOL_DEFAULT, &g_pVB, NULL) < 0)
-        return;
+        return false;
 
-    ImGui_ImplDX9_InitFontsTexture();
+    ImGui_ImplDX9_CreateFontsTexture();
+    return true;
 }
 
-void ImGui_ImplDX9_Shutdown()
+void ImGui_ImplDX9_InvalidateDeviceObjects()
 {
-    ImGui_ImplDX9_InvalidateDeviceObjects();
-    ImGui::Shutdown();
-    g_pd3dDevice = NULL;
-    g_hWnd = 0;
+    if (!g_pd3dDevice)
+        return;
+    if (g_pVB)
+    {
+        g_pVB->Release();
+        g_pVB = NULL;
+    }
+    if (LPDIRECT3DTEXTURE9 tex = (LPDIRECT3DTEXTURE9)ImGui::GetIO().Fonts->TexID)
+    {
+        tex->Release();
+        ImGui::GetIO().Fonts->TexID = 0;
+    }
 }
 
 void ImGui_ImplDX9_NewFrame()
 {
-    if (!g_FontTextureLoaded)
-        ImGui_ImplDX9_InitFontsTexture();
+    if (!g_pVB)
+        ImGui_ImplDX9_CreateDeviceObjects();
 
     ImGuiIO& io = ImGui::GetIO();
 

examples/directx9_example/imgui_impl_dx9.h

@@ -4,13 +4,12 @@
 struct IDirect3DDevice9;
 
 bool        ImGui_ImplDX9_Init(void* hwnd, IDirect3DDevice9* device);
-void        ImGui_ImplDX9_InitFontsTexture();
 void        ImGui_ImplDX9_Shutdown();
 void        ImGui_ImplDX9_NewFrame();
 
 // Use if you want to reset your rendering device without losing ImGui state.
 void        ImGui_ImplDX9_InvalidateDeviceObjects();
-void        ImGui_ImplDX9_CreateDeviceObjects();
+bool        ImGui_ImplDX9_CreateDeviceObjects();
 
 // Handler for Win32 messages, update mouse/keyboard data.
 // You may or not need this for your implementation, but it can serve as reference for handling inputs.

examples/directx9_example/main.cpp

@@ -75,7 +75,6 @@ int main(int argc, char** argv)
     //ImFont* my_font3 = io.Fonts->AddFontFromFileTTF("extra_fonts/ProggyClean.ttf", 13.0f); my_font3->DisplayOffset.y += 1;
     //ImFont* my_font4 = io.Fonts->AddFontFromFileTTF("extra_fonts/ProggyTiny.ttf", 10.0f); my_font4->DisplayOffset.y += 1;
     //ImFont* my_font5 = io.Fonts->AddFontFromFileTTF("c:\\Windows\\Fonts\\ArialUni.ttf", 18.0f, io.Fonts->GetGlyphRangesJapanese());
-    ImGui_ImplDX9_InitFontsTexture();
 
     ShowWindow(hwnd, SW_SHOWDEFAULT);
     UpdateWindow(hwnd);