ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1056 from ssakash/gsdx_swthreads 

GSDX: Some change to software rendering threads
This commit is contained in:
ramapcsx2 2015-12-28 17:23:32 +01:00
parent 3042648ed4 0c4b25bcec
commit ef62d753d1
8 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GSdx/GPU.cpp
View File

@ -108,7 +108,7 @@ EXPORT_C_(int32) GPUopen(void* hWnd)
#endif
int renderer = theApp.GetConfig("Renderer", 1);
int threads = theApp.GetConfig("extrathreads", 0);
int threads = theApp.GetConfig("extrathreads", DEFAULT_EXTRA_RENDERING_THREADS);
switch(renderer)
{

2
plugins/GSdx/GPUSettingsDlg.cpp
View File

@ -74,7 +74,7 @@ void GPUSettingsDlg::OnInit()
CheckDlgButton(m_hWnd, IDC_WINDOWED, theApp.GetConfig("windowed", 1));
SendMessage(GetDlgItem(m_hWnd, IDC_SWTHREADS), UDM_SETRANGE, 0, MAKELPARAM(16, 0));
SendMessage(GetDlgItem(m_hWnd, IDC_SWTHREADS), UDM_SETPOS, 0, MAKELPARAM(theApp.GetConfig("extrathreads", 0), 0));
SendMessage(GetDlgItem(m_hWnd, IDC_SWTHREADS), UDM_SETPOS, 0, MAKELPARAM(theApp.GetConfig("extrathreads", DEFAULT_EXTRA_RENDERING_THREADS), 0));
UpdateControls();
}

2
plugins/GSdx/GS.cpp
View File

@ -190,7 +190,7 @@ static int _GSopen(void** dsp, const char* title, GSRendererType renderer, int t
if(threads == -1)
{
threads = theApp.GetConfig("extrathreads", 0);
threads = theApp.GetConfig("extrathreads", DEFAULT_EXTRA_RENDERING_THREADS);
}
GSWnd* wnd[2] = { NULL, NULL };

4
plugins/GSdx/GS.h
View File

@ -1280,3 +1280,7 @@ enum {FREEZE_LOAD=0, FREEZE_SAVE=1, FREEZE_SIZE=2};
struct GSFreezeData {int size; uint8* data;};
enum stateType {ST_WRITE, ST_TRANSFER, ST_VSYNC};
// default gs config settings
#define DEFAULT_EXTRA_RENDERING_THREADS 2

2
plugins/GSdx/GSLinuxDialog.cpp
View File

@ -286,7 +286,7 @@ void populate_gl_table(GtkWidget* gl_table)
void populate_sw_table(GtkWidget* sw_table)
{
GtkWidget* threads_label = left_label("Extra rendering threads:");
GtkWidget* threads_spin = CreateSpinButton(0, 32, "extrathreads", 0);
GtkWidget* threads_spin = CreateSpinButton(0, 32, "extrathreads", DEFAULT_EXTRA_RENDERING_THREADS);
GtkWidget* aa_check = CreateCheckBox("Edge anti-aliasing (AA1)", "aa1");
GtkWidget* mipmap_check = CreateCheckBox("Mipmap", "mipmap", true);

2
plugins/GSdx/GSSetting.cpp
View File

@ -110,7 +110,7 @@ const char* dialog_message(int ID, bool* updateText) {
return "Internal GS feature. Reduces edge aliasing of lines and triangles when the game requests it.";
case IDC_SWTHREADS:
case IDC_SWTHREADS_EDIT:
return "Increases number of threads used for rendering. Optimal setting depends on CPU.";
return "Number of rendering threads: 0 for single thread, 2 or more for multithread (1 is for debugging)";
case IDC_SHADEBOOST:
return "Allows brightness, contrast and saturation to be manually adjusted.";
case IDC_SHADER_FX:

2
plugins/GSdx/GSSettingsDlg.cpp
View File

@ -172,7 +172,7 @@ void GSSettingsDlg::OnInit()
SendMessage(GetDlgItem(m_hWnd, IDC_RESY), UDM_SETPOS, 0, MAKELPARAM(theApp.GetConfig("resy", 1024), 0));
SendMessage(GetDlgItem(m_hWnd, IDC_SWTHREADS), UDM_SETRANGE, 0, MAKELPARAM(16, 0));
SendMessage(GetDlgItem(m_hWnd, IDC_SWTHREADS), UDM_SETPOS, 0, MAKELPARAM(theApp.GetConfig("extrathreads", 0), 0));
SendMessage(GetDlgItem(m_hWnd, IDC_SWTHREADS), UDM_SETPOS, 0, MAKELPARAM(theApp.GetConfig("extrathreads", DEFAULT_EXTRA_RENDERING_THREADS), 0));
AddTooltip(IDC_FILTER);
AddTooltip(IDC_CRC_LEVEL);

2
plugins/GSdx/GSdx.rc
View File

@ -236,7 +236,7 @@ BEGIN
CONTROL "Mipmapping",IDC_MIPMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,304,90,8
GROUPBOX "Software Mode Settings",IDC_STATIC,6,275,231,40,BS_CENTER
CONTROL "Edge Anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,287,91,10
LTEXT "Extra rendering threads:",IDC_SWTHREADS_TEXT,116,288,83,8
LTEXT "Rendering threads:",IDC_SWTHREADS_TEXT,124,288,80,8
EDITTEXT IDC_SWTHREADS_EDIT,198,286,34,13,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,221,285,11,14
PUSHBUTTON "Configure",IDC_SHADEBUTTON,105,323,127,14