Remove accidentally committed cruft. Fix accidental comment edit.

This commit is contained in:
The Dax 2013-10-12 00:27:02 -04:00
parent d24fc7b559
commit 8195804daa
2 changed files with 1 additions and 4 deletions

View file

@ -834,7 +834,7 @@ void FramebufferManager::CopyDisplayToOutput() {
fbo_unbind();
// Use the extra FBO, with applied FXAA, as a texture.
//fbo_bind_color_as_texture(extraFBOs_[0], 0);
// fbo_bind_color_as_texture(extraFBOs_[0], 0);
if (extraFBOs_.size())
colorTexture = fbo_get_color_texture(extraFBOs_[0]);
}

View file

@ -110,7 +110,6 @@ namespace MainWindow
static std::map<int, std::string> initialMenuKeys;
static std::vector<std::string> countryCodes;
static std::vector<std::string> availableShaders;
static std::vector<int> testVec;
#define MAX_LOADSTRING 100
const TCHAR *szTitle = TEXT("PPSSPP");
const TCHAR *szWindowClass = TEXT("PPSSPPWnd");
@ -354,7 +353,6 @@ namespace MainWindow
SUBMENU_FRAME_SKIPPING = 12,
SUBMENU_TEXTURE_FILTERING = 13,
SUBMENU_TEXTURE_SCALING = 14,
};
std::string GetMenuItemText(int menuID) {
@ -585,7 +583,6 @@ namespace MainWindow
// Help menu: it's translated in CreateHelpMenu.
CreateHelpMenu();
// TODO: Urgh! Why do we need this here?
// The menu is supposed to enable/disable this stuff directly afterward.
SetIngameMenuItemStates(globalUIState);