mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-27 02:40:05 +00:00
Code Activity

Merge branch 'master' into examples_refactor

Browse source
This commit is contained in:
omar 2018-02-20 16:18:02 +01:00
commit bcdfd5d61c
14 changed files with 123 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

5
examples/imgui_impl_dx9.cpp
View file

@ -12,7 +12,6 @@
// (minor and older changes stripped away, please see git history for details)
// 2018-02-16: Misc: Obsoleted the io.RenderDrawListsFn callback and exposed ImGui_ImplDX9_RenderDrawData() in the .h file so you can call it yourself.
// 2018-02-06: Misc: Removed call to ImGui::Shutdown() which is not available from 1.60 WIP, user needs to call CreateContext/DestroyContext themselves.
// 2018-02-06: Inputs: Added mapping for ImGuiKey_Space.
#include "imgui.h"
#include "imgui_impl_dx9.h"
@ -22,7 +21,7 @@
#define DIRECTINPUT_VERSION 0x0800
#include <dinput.h>
// Data
// DirectX data
static LPDIRECT3DDEVICE9 g_pd3dDevice = NULL;
static LPDIRECT3DVERTEXBUFFER9 g_pVB = NULL;
static LPDIRECT3DINDEXBUFFER9 g_pIB = NULL;
@ -175,7 +174,7 @@ void ImGui_ImplDX9_RenderDrawData(ImDrawData* draw_data)
d3d9_state_block->Release();
}
bool ImGui_ImplDX9_Init(IDirect3DDevice9* device)
bool ImGui_ImplDX9_Init(IDirect3DDevice9* device)
{
g_pd3dDevice = device;
return true;