diff --git a/Core/Config.cpp b/Core/Config.cpp index a3cf802e05..4eb18cf97b 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -152,8 +152,6 @@ void Config::Load(const char *iniFileName) pspConfig->Get("EncryptSave", &bEncryptSave, true); CleanRecent(); - // Ephemeral settings - bDrawWireframe = false; } void Config::Save() diff --git a/Core/Config.h b/Core/Config.h index e439e9a9c9..de54fd6142 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -56,7 +56,6 @@ public: bool bDisplayFramebuffer; bool bHardwareTransform; bool bBufferedRendering; - bool bDrawWireframe; bool bLinearFiltering; bool bUseVBO; #ifdef BLACKBERRY10 diff --git a/GPU/GLES/DisplayListInterpreter.cpp b/GPU/GLES/DisplayListInterpreter.cpp index 4e7e7f64cb..e6b5e88e40 100644 --- a/GPU/GLES/DisplayListInterpreter.cpp +++ b/GPU/GLES/DisplayListInterpreter.cpp @@ -249,19 +249,6 @@ void GLES_GPU::DumpNextFrame() { dumpNextFrame_ = true; } -void GLES_GPU::BeginDebugDraw() { - if (g_Config.bDrawWireframe) { -#ifndef USING_GLES2 - glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); -#endif - } -} -void GLES_GPU::EndDebugDraw() { -#ifndef USING_GLES2 - glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); -#endif -} - void GLES_GPU::BeginFrame() { textureCache_.StartFrame(); transformDraw_.DecimateTrackedVertexArrays(); @@ -300,16 +287,12 @@ void GLES_GPU::CopyDisplayToOutput() { transformDraw_.Flush(); - EndDebugDraw(); - framebufferManager_.CopyDisplayToOutput(); framebufferManager_.EndFrame(); shaderManager_->EndFrame(); gstate_c.textureChanged = true; - - BeginDebugDraw(); } // Render queue diff --git a/GPU/GLES/DisplayListInterpreter.h b/GPU/GLES/DisplayListInterpreter.h index d3e2cd5c34..8b60a5b781 100644 --- a/GPU/GLES/DisplayListInterpreter.h +++ b/GPU/GLES/DisplayListInterpreter.h @@ -75,10 +75,6 @@ private: void CheckFlushOp(u32 op, u32 diff); void BuildReportingInfo(); - // Applies states for debugging if enabled. - void BeginDebugDraw(); - void EndDebugDraw(); - FramebufferManager framebufferManager_; TextureCache textureCache_; TransformDrawEngine transformDraw_; diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 7d2168ea35..b903a38ea1 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -85,7 +85,7 @@ EmuScreen::EmuScreen(const std::string &filename) : invalid_(true) { ERROR_LOG(BOOT, "%s", errorMessage_.c_str()); return; } - + globalUIState = UISTATE_INGAME; host->BootDone(); host->UpdateDisassembly(); diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp index 24365d2cff..467b3b2e7c 100644 --- a/UI/MenuScreens.cpp +++ b/UI/MenuScreens.cpp @@ -707,7 +707,6 @@ void GraphicsScreenP1::render() { gpu->Resized(); } } - UICheckBox(GEN_ID, x, y += stride, gs->T("Draw Wireframe"), ALIGN_TOPLEFT, &g_Config.bDrawWireframe); UICheckBox(GEN_ID, x, y += stride, gs->T("Display Raw Framebuffer"), ALIGN_TOPLEFT, &g_Config.bDisplayFramebuffer); UIEnd(); }