lauchmelder/bpp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from Lauchmelder23/master

Browse source 
Fixed memory issue + windows clear bug
This commit is contained in:
c1m5j 2021-07-30 15:42:27 +02:00 committed by GitHub
parent ba697ff978 6d40227779
commit df5a53d488
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/main.cpp
View file

@ -26,6 +26,20 @@ int main(int argc, char** argv)
SDL_Window* window = SDL_CreateWindow("Bytepusher++", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 1000, 700, SDL_WINDOW_RESIZABLE); SDL_Window* window = SDL_CreateWindow("Bytepusher++", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 1000, 700, SDL_WINDOW_RESIZABLE);
SDL_Renderer* renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED); SDL_Renderer* renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
// There is a bug in ImGui where the background isn't cleared properly on Windows 10.
// The workaround is to create a texture with the background color and use that to clear the screen instead
#ifdef _WIN32
SDL_Texture* windowsClearFix = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_ABGR8888, SDL_TEXTUREACCESS_STREAMING, 1, 1);
Uint8* pixels;
int pitch;
SDL_LockTexture(windowsClearFix, NULL, (void**)&pixels, &pitch);
pixels[0] = 114;
pixels[1] = 144;
pixels[2] = 154;
pixels[3] = 255;
SDL_UnlockTexture(windowsClearFix);
#endif
// VM initialisation // VM initialisation
Bus* bus = new Bus(); Bus* bus = new Bus();
@ -48,15 +62,6 @@ int main(int argc, char** argv)
ImGuiSDL::Initialize(renderer, 900, 700); ImGuiSDL::Initialize(renderer, 900, 700);
ImGui::StyleColorsDark(); ImGui::StyleColorsDark();
// Clears screen
SDL_Texture* clear = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA32, SDL_TEXTUREACCESS_TARGET, 100, 100);
{
SDL_SetRenderTarget(renderer, clear);
SDL_SetRenderDrawColor(renderer, 255, 0, 255, 255);
SDL_RenderClear(renderer);
SDL_SetRenderTarget(renderer, nullptr);
}
std::time_t res = std::time(nullptr); std::time_t res = std::time(nullptr);
std::string date = std::ctime(&res); std::string date = std::ctime(&res);
date = date.substr(0, date.length() - 1); date = date.substr(0, date.length() - 1);
@ -216,7 +221,12 @@ int main(int argc, char** argv)
ImGui::End(); ImGui::End();
SDL_SetRenderDrawColor(renderer, 114, 144, 154, 255); SDL_SetRenderDrawColor(renderer, 114, 144, 154, 255);
#ifdef _WIN32
SDL_RenderCopy(renderer, windowsClearFix, NULL, NULL);
#else
SDL_RenderClear(renderer); SDL_RenderClear(renderer);
#endif
ImGui::Render(); ImGui::Render();
ImGuiSDL::Render(ImGui::GetDrawData()); ImGuiSDL::Render(ImGui::GetDrawData());
@ -231,10 +241,6 @@ int main(int argc, char** argv)
ImGuiSDL::Deinitialize(); ImGuiSDL::Deinitialize();
SDL_DestroyTexture(clear);
SDL_DestroyRenderer(renderer);
SDL_DestroyWindow(window);
delete cpu; delete cpu;
delete memory; delete memory;
delete display; delete display;
@ -242,6 +248,12 @@ int main(int argc, char** argv)
delete bus; delete bus;
ImGui::DestroyContext(); ImGui::DestroyContext();
#ifdef _WIN32
SDL_DestroyTexture(windowsClearFix);
#endif
SDL_DestroyRenderer(renderer);
SDL_DestroyWindow(window);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }