1.4.x: x86emitter: fix compilation issue with recent GCC

close #1544

README.md

@@ -30,11 +30,3 @@ Installers and binaries for both Windows and Linux are available from **[our hom
 
 | ![Pro Evo 2009](https://dl.dropboxusercontent.com/u/743491/PCSX2/ProEvo2009.jpg "Pro Evo 2009") | ![Megaman X8](https://dl.dropboxusercontent.com/u/743491/PCSX2/MegamanX8.jpg "Megaman X8") | ![TOTA](https://dl.dropboxusercontent.com/u/743491/PCSX2/TOTA.jpg "TOTA")
 |:----:|:----:|:----:|
-
-# Quality Assurance
-
-**Build** | **Status**
---------|--------
-Linux   | [![Travis Build Status](https://travis-ci.org/PCSX2/pcsx2.svg?branch=master)](https://travis-ci.org/PCSX2/pcsx2)
-Window  | [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/b67odm0dd506co78/branch/master?svg=true)](https://ci.appveyor.com/project/gregory38/pcsx2/branch/master)
-Coverity| [![Coverity Scan Build Status](https://scan.coverity.com/projects/6310/badge.svg)](https://scan.coverity.com/projects/6310)

bin/PCSX2_keys.ini.default

@@ -46,9 +46,7 @@ Framelimiter_MasterToggle         = F4
 
 FullscreenToggle                  = Alt-ENTER
 
-# Note: toggles suspend, but can resume only if the GS window is not set to hide
-# when paused (Emu options -> GS window), and when the GS window is focused.
-Sys_SuspendResume                 = ESC
+Sys_Suspend                       = ESC
 
 # Screenshot. Note: must not include shift or ctrl. With these held - it will
 # create debug GS dump. The two other shortcuts will be added automatically.

bin/portable.ini

@@ -1 +1,2 @@
-RunWizard=0
+RunWizard=1
+Version=140

common/src/x86emitter/cpudetect.cpp

@@ -16,6 +16,9 @@
 #include "PrecompiledHeader.h"
 #include "cpudetect_internal.h"
 #include "internal.h"
+#ifdef __linux__
+#include "fxsrintrin.h"
+#endif
 
 using namespace x86Emitter;
 

debian-packager/create_built_tarball.sh

@@ -31,7 +31,7 @@ EOF
 
 # Default value
 GIT_SHA1=0;
-BRANCH="master"
+BRANCH="1.4.x"
 while [ -n "$1" ]; do
 case $1 in
     -help|-h   ) help;shift 1;;

linux_various/generate_pot.sh

@@ -21,7 +21,7 @@ set -e
 ######################################################################
 # Script configuration
 ######################################################################
-VERSION=1.3.0
+VERSION=1.4.0
 COPYRIGHT="PCSX2 Dev Team"
 BUG_MAIL="https://github.com/PCSX2/pcsx2/issues"
 

pcsx2/SysForwardDefs.h

@@ -16,9 +16,9 @@
 #pragma once
 
 static const int PCSX2_VersionHi	= 1;
-static const int PCSX2_VersionMid	= 5;
+static const int PCSX2_VersionMid	= 4;
 static const int PCSX2_VersionLo	= 0;
-static const bool PCSX2_isReleaseVersion = 0;
+static const bool PCSX2_isReleaseVersion = 1;
 
 class SysCoreThread;
 

pcsx2/gui/AppConfig.cpp

@@ -56,7 +56,8 @@ namespace PathDefs
 
 		const wxDirName& Settings()
 		{
-			static const wxDirName retval( L"inis" );
+			static const wxDirName retval(wxsFormat(L"inis_%d.%d.%d",
+			PCSX2_VersionHi, PCSX2_VersionMid, PCSX2_VersionLo));
 			return retval;
 		}
 
@@ -939,7 +940,6 @@ AppConfig::UiTemplateOptions::UiTemplateOptions()
 	OutputField			= L"Field";
 	OutputProgressive	= L"Progressive";
 	OutputInterlaced	= L"Interlaced";
-	Paused				= L"<PAUSED> ";
 	TitleTemplate		= L"Slot: ${slot} | Speed: ${speed} (${vfps}) | Limiter: ${limiter} | ${gsdx} | ${omodei} | ${cpuusage}";
 }
 
@@ -955,7 +955,6 @@ void AppConfig::UiTemplateOptions::LoadSave(IniInterface& ini)
 	IniEntry(OutputField);
 	IniEntry(OutputProgressive);
 	IniEntry(OutputInterlaced);
-	IniEntry(Paused);
 	IniEntry(TitleTemplate);
 }
 

pcsx2/gui/AppConfig.h

@@ -253,7 +253,6 @@ public:
 		wxString OutputField;
 		wxString OutputProgressive;
 		wxString OutputInterlaced;
-		wxString Paused;
 		wxString TitleTemplate;
 	};
 

pcsx2/gui/AppUserMode.cpp

@@ -289,13 +289,15 @@ void Pcsx2App::EstablishAppUserMode()
 	// Wizard is only run once.  The status of the wizard having been run is stored in
 	// the installation ini file, which can be either the portable install (useful for admins)
 	// or the registry/user local documents position.
-
+	int version;
+	conf_install->Read(L"Version", &version, 0);
 	bool runWiz;
 	conf_install->Read( L"RunWizard", &runWiz, true );
 
 	App_LoadInstallSettings( conf_install );
+	int pcsx2Ver = PCSX2_VersionHi * 100 + PCSX2_VersionMid * 10 + PCSX2_VersionLo;
 
-	if( !Startup.ForceWizard && !runWiz )
+	if( !Startup.ForceWizard && !runWiz && version == pcsx2Ver)
 	{
 		AppConfig_OnChangedSettingsFolder( false );
 		return;
@@ -310,5 +312,6 @@ void Pcsx2App::EstablishAppUserMode()
 
 	// Wizard completed successfully, so let's not torture the user with this crap again!
 	conf_install->Write( L"RunWizard", false );
+	conf_install->Write(L"Version", pcsx2Ver);
 }
 

pcsx2/gui/FrameForGS.cpp

@@ -66,7 +66,7 @@ void GSPanel::InitDefaultAccelerators()
 	m_Accels->Map( AAC( WXK_RIGHT ).Cmd().Alt(),	"GSwindow_OffsetXplus" );
 	m_Accels->Map( AAC( WXK_NUMPAD_DIVIDE ).Cmd().Alt(),	"GSwindow_OffsetReset" );
 
-	m_Accels->Map( AAC( WXK_ESCAPE ),			"Sys_SuspendResume" );
+	m_Accels->Map( AAC( WXK_ESCAPE ),			"Sys_Suspend" );
 	m_Accels->Map( AAC( WXK_F8 ),				"Sys_TakeSnapshot" ); // also shift and ctrl-shift will be added automatically
 	m_Accels->Map( AAC( WXK_F9 ),				"Sys_RenderswitchToggle");
 
@@ -101,8 +101,8 @@ GSPanel::GSPanel( wxWindow* parent )
 
 	Connect(wxEVT_CLOSE_WINDOW,		wxCloseEventHandler	(GSPanel::OnCloseWindow));
 	Connect(wxEVT_SIZE,				wxSizeEventHandler	(GSPanel::OnResize));
-	Connect(wxEVT_KEY_UP,			wxKeyEventHandler	(GSPanel::OnKeyDownOrUp));
-	Connect(wxEVT_KEY_DOWN,			wxKeyEventHandler	(GSPanel::OnKeyDownOrUp));
+	Connect(wxEVT_KEY_UP,			wxKeyEventHandler	(GSPanel::OnKeyDown));
+	Connect(wxEVT_KEY_DOWN,			wxKeyEventHandler	(GSPanel::OnKeyDown));
 
 	Connect(wxEVT_SET_FOCUS,		wxFocusEventHandler	(GSPanel::OnFocus));
 	Connect(wxEVT_KILL_FOCUS,		wxFocusEventHandler	(GSPanel::OnFocusLost));
@@ -263,7 +263,7 @@ void GSPanel::OnHideMouseTimeout( wxTimerEvent& evt )
 	m_CursorShown = false;
 }
 
-void GSPanel::OnKeyDownOrUp( wxKeyEvent& evt )
+void GSPanel::OnKeyDown( wxKeyEvent& evt )
 {
 
 	// HACK: Legacy PAD plugins expect PCSX2 to ignore keyboard messages on the GS Window while
@@ -288,25 +288,6 @@ void GSPanel::OnKeyDownOrUp( wxKeyEvent& evt )
 	}
 #endif
 
-#ifdef __WXMSW__
-	// Not sure what happens on Linux, but on windows this method is called only when emulation
-	// is paused and the GS window is not hidden (and therefore the event doesn't arrive from
-	// the pad plugin and doesn't go through Pcsx2App::PadKeyDispatch). On such case (paused).
-	// It needs to handle two issues:
-	// 1. It's called both for key down and key up (linux apparently needs it this way) - but we
-	//    don't want to execute the command twice (normally commands execute on key down only).
-	// 2. It has wx keycode which is upper case for ascii chars, but our command handlers expect
-	//    lower case for non-special keys.
-
-	// ignore key up events
-	if (evt.GetEventType() == wxEVT_KEY_UP)
-		return;
-
-	// Make ascii keys lower case - this apparently works correctly also with modifiers (shift included)
-	if (evt.m_keyCode >= 'A' && evt.m_keyCode <= 'Z')
-		evt.m_keyCode += (int)'a' - 'A';
-#endif
-
 	if( (PADopen != NULL) && CoreThread.IsOpen() ) return;
 	DirectKeyCommand( evt );
 }
@@ -622,8 +603,6 @@ void GSFrame::OnUpdateTitle( wxTimerEvent& evt )
 	title.Replace(L"${omodef}",		omodef);
 	title.Replace(L"${omodei}",		omodei);
 	title.Replace(L"${gsdx}",		fromUTF8(gsDest));
-	if (CoreThread.IsPaused())
-		title = templates.Paused + title;
 
 	SetTitle(title);
 }

pcsx2/gui/GSFrame.h

@@ -63,7 +63,7 @@ protected:
 	void OnResize(wxSizeEvent& event);
 	void OnMouseEvent( wxMouseEvent& evt );
 	void OnHideMouseTimeout( wxTimerEvent& evt );
-	void OnKeyDownOrUp( wxKeyEvent& evt );
+	void OnKeyDown( wxKeyEvent& evt );
 	void OnFocus( wxFocusEvent& evt );
 	void OnFocusLost( wxFocusEvent& evt );
 	void CoreThread_OnResumed();

pcsx2/gui/GlobalCommands.cpp

@@ -327,8 +327,7 @@ namespace Implementations
 			}
 		}
 
-		if (g_Conf->GSWindow.CloseOnEsc)
-			sMainFrame.SetFocus();
+		sMainFrame.SetFocus();
 	}
 
 	void Sys_Resume()
@@ -336,17 +335,6 @@ namespace Implementations
 		CoreThread.Resume();
 	}
 
-	void Sys_SuspendResume()
-	{
-		if (CoreThread.HasPendingStateChangeRequest())
-			return;
-
-		if (CoreThread.IsPaused())
-			Sys_Resume();
-		else
-			Sys_Suspend();
-	}
-
 	void Sys_TakeSnapshot()
 	{
 		GSmakeSnapshot( g_Conf->Folders.Snapshots.ToAscii() );
@@ -558,8 +546,8 @@ static const GlobalCommandDescriptor CommandDeclarations[] =
 	{	"GSwindow_OffsetXplus",		Implementations::GSwindow_OffsetXplus, NULL, NULL, },
 	{	"GSwindow_OffsetReset",		Implementations::GSwindow_OffsetReset, NULL, NULL, },
 
-	{	"Sys_SuspendResume",
-		Implementations::Sys_SuspendResume,
+	{	"Sys_Suspend",
+		Implementations::Sys_Suspend,
 		NULL,
 		NULL,
 	},

plugins/GSdx/GLLoader.cpp

@@ -329,7 +329,7 @@ namespace GLLoader {
 
 
 	// GL4 hardware (due to proprietary driver limitation)
-	bool found_GL_ARB_separate_shader_objects = false; // Issue with Catalyst...
+	bool found_GL_ARB_separate_shader_objects = false; // Issue with Mesa and Catalyst...
 	bool found_geometry_shader = true; // we require GL3.3 so geometry must be supported by default
 	bool found_GL_EXT_texture_filter_anisotropic = false;
 	bool found_GL_ARB_clear_texture = false; // Don't know if GL3 GPU can support it
@@ -337,8 +337,8 @@ namespace GLLoader {
 	bool found_GL_ARB_copy_image = false; // Not sure actually maybe GL3 GPU can do it
 	bool found_GL_ARB_gpu_shader5 = false;
 	bool found_GL_ARB_shader_image_load_store = false; // GLES3.1
-	// DX10 GPU limited driver
 	bool found_GL_ARB_texture_barrier = false; // Well maybe supported by older hardware I don't know
+	// DX10 GPU limited driver
 	bool found_GL_ARB_draw_buffers_blend = false;
 	bool found_GL_ARB_clip_control = false;
 	bool found_GL_ARB_direct_state_access = false;
@@ -434,8 +434,7 @@ namespace GLLoader {
 				// GL4.1
 				if (ext.compare("GL_ARB_separate_shader_objects") == 0) {
 					if (!fglrx_buggy_driver && !mesa_amd_buggy_driver && !intel_buggy_driver) found_GL_ARB_separate_shader_objects = true;
-					else fprintf(stderr, "Buggy driver detected, GL_ARB_separate_shader_objects will be disabled\n"
-							"Note the extension was fixed on Mesa 11.1, you will need a manual overwrite to use it\n");
+					else fprintf(stderr, "Buggy driver detected, GL_ARB_separate_shader_objects will be disabled\n");
 				}
 				// GL4.2
 				if (ext.compare("GL_ARB_shading_language_420pack") == 0) found_GL_ARB_shading_language_420pack = true;

plugins/GSdx/GSDeviceOGL.cpp

@@ -1522,7 +1522,7 @@ void GSDeviceOGL::CheckDebugLog()
 // Note: used as a callback of DebugMessageCallback. Don't change the signature
 void GSDeviceOGL::DebugOutputToFile(GLenum gl_source, GLenum gl_type, GLuint id, GLenum gl_severity, GLsizei gl_length, const GLchar *gl_message, const void* userParam)
 {
-	std::string message(gl_message, gl_length >= 0 ? gl_length : strlen(gl_message));
+	std::string message(gl_message, gl_length);
 	std::string type, severity, source;
 	static int sev_counter = 0;
 	switch(gl_type) {

plugins/GSdx/GSWndOGL.cpp

@@ -124,7 +124,7 @@ void GSWndOGL::CheckContext()
 	int glxMajorVersion, glxMinorVersion;
 	glXQueryVersion(m_NativeDisplay, &glxMajorVersion, &glxMinorVersion);
 	if (glXIsDirect(m_NativeDisplay, m_context))
-		fprintf(stdout, "glX-Version %d.%d with Direct Rendering\n", glxMajorVersion, glxMinorVersion);
+		fprintf(stderr, "glX-Version %d.%d with Direct Rendering\n", glxMajorVersion, glxMinorVersion);
 	else {
 		fprintf(stderr, "glX-Version %d.%d with Indirect Rendering !!! It won't support properly opengl\n", glxMajorVersion, glxMinorVersion);
 		throw GSDXRecoverableError();