mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-26 19:58:36 +01:00
More minor cleanup. Update lang.
This commit is contained in:
1 parent
05ee55ea46
commit
ca512ea06a
4 files changed
+14
-9
No files matched your search
+2
-4
@@ -805,10 +805,10 @@ void EmuScreen::render() {
|
||||
if (useBufferedRendering && g_Config.iGPUBackend == GPU_BACKEND_OPENGL)
|
||||
fbo_unbind();
|
||||
|
||||
if (!osm.IsEmpty() || g_Config.bShowDebugStats || g_Config.iShowFPSCounter || g_Config.bShowTouchControls || g_Config.bShowDeveloperMenu || g_Config.bShowAudioDebug) {
|
||||
|
||||
if (!osm.IsEmpty() || g_Config.bShowDebugStats || g_Config.iShowFPSCounter || g_Config.bShowTouchControls || g_Config.bShowDeveloperMenu || g_Config.bShowAudioDebug || saveStatePreview_->GetVisibility() != UI::V_GONE) {
|
||||
Thin3DContext *thin3d = screenManager()->getThin3DContext();
|
||||
|
||||
// This sets up some important states but not the viewport.
|
||||
screenManager()->getUIContext()->Begin();
|
||||
|
||||
T3DViewport viewport;
|
||||
@@ -819,8 +819,6 @@ void EmuScreen::render() {
|
||||
viewport.MaxDepth = 1.0;
|
||||
viewport.MinDepth = 0.0;
|
||||
thin3d->SetViewports(1, &viewport);
|
||||
thin3d->SetBlendState(thin3d->GetBlendStatePreset(BS_STANDARD_ALPHA));
|
||||
thin3d->SetScissorEnabled(false);
|
||||
|
||||
DrawBuffer *draw2d = screenManager()->getUIContext()->Draw();
|
||||
|
||||
|
||||
@@ -26,6 +26,7 @@ static HDC hDC; // Private GDI Device Context
|
||||
static HGLRC hRC; // Permanent Rendering Context
|
||||
static HWND hWnd; // Holds Our Window Handle
|
||||
static D3DPRESENT_PARAMETERS pp;
|
||||
static HMODULE hD3D9;
|
||||
|
||||
// TODO: Make config?
|
||||
static bool enableGLDebug = true;
|
||||
@@ -68,7 +69,7 @@ bool D3D9_Init(HWND wnd, bool windowed, std::string *error_message) {
|
||||
|
||||
DIRECT3DCREATE9EX g_pfnCreate9ex;
|
||||
|
||||
HMODULE hD3D9 = LoadLibrary(TEXT("d3d9.dll"));
|
||||
hD3D9 = LoadLibrary(TEXT("d3d9.dll"));
|
||||
if (!hD3D9) {
|
||||
ELOG("Missing d3d9.dll");
|
||||
*error_message = "D3D9.dll missing - try reinstalling DirectX.";
|
||||
@@ -100,7 +101,6 @@ bool D3D9_Init(HWND wnd, bool windowed, std::string *error_message) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
FreeLibrary(hD3D9);
|
||||
|
||||
D3DCAPS9 d3dCaps;
|
||||
|
||||
@@ -231,4 +231,6 @@ void D3D9_Shutdown() {
|
||||
DX9::pD3DdeviceEx = nullptr;
|
||||
device = nullptr;
|
||||
hWnd = nullptr;
|
||||
FreeLibrary(hD3D9);
|
||||
hD3D9 = nullptr;
|
||||
}
|
||||
@@ -20,6 +20,7 @@
|
||||
#include "Windows/GEDebugger/GEDebugger.h"
|
||||
#include "Windows/GEDebugger/SimpleGLWindow.h"
|
||||
#include "Core/System.h"
|
||||
#include "Core/Config.h"
|
||||
#include "GPU/GPUInterface.h"
|
||||
#include "GPU/Common/GPUDebugInterface.h"
|
||||
#include "GPU/GPUState.h"
|
||||
@@ -257,6 +258,10 @@ void CGEDebugger::UpdatePrimPreview(u32 op) {
|
||||
}
|
||||
|
||||
void CGEDebugger::CleanupPrimPreview() {
|
||||
glsl_destroy(previewProgram);
|
||||
glsl_destroy(texPreviewProgram);
|
||||
if (previewProgram) {
|
||||
glsl_destroy(previewProgram);
|
||||
}
|
||||
if (texPreviewProgram) {
|
||||
glsl_destroy(texPreviewProgram);
|
||||
}
|
||||
}
|
||||
+1
-1
Submodule lang updated: 5aca62de1c...8ba302b6ba.
Reference in new issue
Block a user