From 863b36d04b90510f8e818a4c45fe253dc7bb27dd Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Fri, 30 Sep 2022 00:39:42 +0200 Subject: [PATCH] Emscripten expects GLES2 (WebGL 1). --- profiler/src/BackendGlfw.cpp | 10 +++++++++- server/TracyTexture.cpp | 6 +++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/profiler/src/BackendGlfw.cpp b/profiler/src/BackendGlfw.cpp index 02ab64c8..516fc05c 100644 --- a/profiler/src/BackendGlfw.cpp +++ b/profiler/src/BackendGlfw.cpp @@ -1,6 +1,10 @@ #include "imgui/imgui_impl_glfw.h" #include "imgui/imgui_impl_opengl3.h" -#include "imgui/imgui_impl_opengl3_loader.h" +#ifdef __EMSCRIPTEN__ +# include +#else +# include "imgui/imgui_impl_opengl3_loader.h" +#endif #include #include @@ -80,7 +84,11 @@ Backend::Backend( const char* title, std::function redraw, RunQueue* mai glfwSetWindowRefreshCallback( s_window, []( GLFWwindow* ) { s_redraw(); } ); ImGui_ImplGlfw_InitForOpenGL( s_window, true ); +#ifdef __EMSCRIPTEN__ + ImGui_ImplOpenGL3_Init( "#version 100" ); +#else ImGui_ImplOpenGL3_Init( "#version 150" ); +#endif s_redraw = redraw; s_mainThreadTasks = mainThreadTasks; diff --git a/server/TracyTexture.cpp b/server/TracyTexture.cpp index 8bc6f465..1fa748c2 100644 --- a/server/TracyTexture.cpp +++ b/server/TracyTexture.cpp @@ -1,6 +1,10 @@ #include -#include "../profiler/src/imgui/imgui_impl_opengl3_loader.h" +#ifdef __EMSCRIPTEN__ +# include +#else +# include "../profiler/src/imgui/imgui_impl_opengl3_loader.h" +#endif #include "TracyTexture.hpp" #ifndef COMPRESSED_RGB_S3TC_DXT1_EXT