From 169e3981fdf037b179f1c7296548892ba7837dae Mon Sep 17 00:00:00 2001 From: omar Date: Mon, 11 Feb 2019 19:09:54 +0100 Subject: [PATCH 1/2] Examples: OpenGL2: Added #define GL_SILENCE_DEPRECATION to cope with newer XCode warnings. --- docs/CHANGELOG.txt | 1 + examples/example_glfw_opengl2/main.cpp | 3 +++ examples/imgui_impl_opengl2.cpp | 1 + 3 files changed, 5 insertions(+) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index c8dbff1c0..91436faee 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -81,6 +81,7 @@ Other Changes: - Examples: Win32: Added support for XInput games (if ImGuiConfigFlags_NavEnableGamepad is enabled). - Examples: Win32: Added support for mouse buttons 4 and 5 via WM_XBUTTON* messages. (#2264) - Examples: DirectX9: Explicitly disable fog (D3DRS_FOGENABLE) before drawing in case user state has it set. (#2288, #2230) +- Examples: OpenGL2: Added #define GL_SILENCE_DEPRECATION to cope with newer XCode warnings. - Examples: OpenGL3: Using GLSL 4.10 shaders for any GLSL version over 410 (e.g. 430, 450). (#2329) [@BrutPitt] diff --git a/examples/example_glfw_opengl2/main.cpp b/examples/example_glfw_opengl2/main.cpp index eae7ed786..084637132 100644 --- a/examples/example_glfw_opengl2/main.cpp +++ b/examples/example_glfw_opengl2/main.cpp @@ -10,6 +10,9 @@ #include "imgui_impl_glfw.h" #include "imgui_impl_opengl2.h" #include +#ifdef __APPLE__ +#define GL_SILENCE_DEPRECATION +#endif #include // [Win32] Our example includes a copy of glfw3.lib pre-compiled with VS2010 to maximize ease of testing and compatibility with old VS compilers. diff --git a/examples/imgui_impl_opengl2.cpp b/examples/imgui_impl_opengl2.cpp index 99ca96907..5acccc081 100644 --- a/examples/imgui_impl_opengl2.cpp +++ b/examples/imgui_impl_opengl2.cpp @@ -44,6 +44,7 @@ #define WINGDIAPI __declspec(dllimport) // Some Windows OpenGL headers need this #endif #if defined(__APPLE__) +#define GL_SILENCE_DEPRECATION #include #else #include From cc80d8e118c1295a1bc005d2180b97e4778facb3 Mon Sep 17 00:00:00 2001 From: omar Date: Tue, 12 Feb 2019 10:30:09 +0100 Subject: [PATCH 2/2] Examples: Metal: Compilation fix. --- examples/imgui_impl_metal.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/imgui_impl_metal.mm b/examples/imgui_impl_metal.mm index 95c532361..a1ed7d748 100644 --- a/examples/imgui_impl_metal.mm +++ b/examples/imgui_impl_metal.mm @@ -402,8 +402,8 @@ void ImGui_ImplMetal_DestroyDeviceObjects() commandEncoder:(id)commandEncoder { // Avoid rendering when minimized, scale coordinates for retina displays (screen coordinates != framebuffer coordinates) - int fb_width = (int)(drawData->DisplaySize.x * draw_data->FramebufferScale.x); - int fb_height = (int)(drawData->DisplaySize.y * draw_data->FramebufferScale.y); + int fb_width = (int)(drawData->DisplaySize.x * drawData->FramebufferScale.x); + int fb_height = (int)(drawData->DisplaySize.y * drawData->FramebufferScale.y); if (fb_width <= 0 || fb_height <= 0 || drawData->CmdListsCount == 0) return; @@ -450,8 +450,8 @@ void ImGui_ImplMetal_DestroyDeviceObjects() [commandEncoder setVertexBuffer:vertexBuffer.buffer offset:0 atIndex:0]; // Will project scissor/clipping rectangles into framebuffer space - ImVec2 clip_off = draw_data->DisplayPos; // (0,0) unless using multi-viewports - ImVec2 clip_scale = draw_data->FramebufferScale; // (1,1) unless using retina display which are often (2,2) + ImVec2 clip_off = drawData->DisplayPos; // (0,0) unless using multi-viewports + ImVec2 clip_scale = drawData->FramebufferScale; // (1,1) unless using retina display which are often (2,2) // Render command lists size_t vertexBufferOffset = 0;