empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ImGui: avoid non-reentrant call to VideoPresentScreen().

Browse source 
The debugger (which calls VideoPresentScreen) is execute in immediate mode from VideoPresentScreen.

Is this a design problem?

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2022-01-11 17:50:08 +00:00
parent 2abca0c0b2
commit c70377fcaf
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
source/frontends/sdl/imgui/sdlimguiframe.cpp
View file

@ -36,6 +36,7 @@ namespace sa2
SDLImGuiFrame::SDLImGuiFrame(const common2::EmulatorOptions & options)
: SDLFrame(options)
, myPresenting(false)
{
SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SA2_CONTEXT_FLAGS);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SA2_CONTEXT_PROFILE_MASK);
@ -187,18 +188,25 @@ namespace sa2
void SDLImGuiFrame::VideoPresentScreen()
{
ImGui_ImplOpenGL3_NewFrame();
ImGui_ImplSDL2_NewFrame(myWindow.get());
ImGui::NewFrame();
// this is NOT REENTRANT
// the debugger (executed via mySettings.show(this)) might call it recursively
if (!myPresenting)
{
myPresenting = true;
ImGui_ImplOpenGL3_NewFrame();
ImGui_ImplSDL2_NewFrame();
ImGui::NewFrame();
// "this" is a bit circular
mySettings.show(this);
DrawAppleVideo();
// "this" is a bit circular
mySettings.show(this);
DrawAppleVideo();
ImGui::Render();
ClearBackground();
ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
SDL_GL_SwapWindow(myWindow.get());
ImGui::Render();
ClearBackground();
ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());
SDL_GL_SwapWindow(myWindow.get());
myPresenting = false;
}
}
void SDLImGuiFrame::ProcessSingleEvent(const SDL_Event & event, bool & quit)

1
source/frontends/sdl/imgui/sdlimguiframe.h
View file

@ -41,6 +41,7 @@ namespace sa2
size_t myBorderlessHeight;
int myDeadTopZone; // for mouse position
bool myPresenting; // VideoPresentScreen() is NOT REENTRANT
SDL_GLContext myGLContext;
ImTextureID myTexture;