mirror of https://github.com/PCSX2/pcsx2.git
GSdx: Removed obsolete/redundant options from the configuration dialog (vsync, fullscreen, and other things now controlled by 0.9.7). This only affects GSdx when run from 0.9.7 -- older versions of PCSX2 still have the same options.
PCSX2: Added an optional PS2EsetEmuVersion callback for plugins, so that plugins (like GSdx) can alter behavior based on the version of emulator calling them. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2530 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
a9165dfbf6
commit
9fa4944536
|
@ -536,6 +536,8 @@ typedef u32 (CALLBACK* _PS2EgetLibType)(void);
|
|||
typedef u32 (CALLBACK* _PS2EgetLibVersion2)(u32 type);
|
||||
typedef char*(CALLBACK* _PS2EgetLibName)(void);
|
||||
|
||||
typedef void (CALLBACK* _PS2EsetEmuVersion)(const char* emuId, u32 version); // HACK to let some plugins know it's 0.9.7 PCSX2 --air
|
||||
|
||||
// GS
|
||||
// NOTE: GSreadFIFOX/GSwriteCSR functions CANNOT use XMM/MMX regs
|
||||
// If you want to use them, need to save and restore current ones
|
||||
|
|
|
@ -701,6 +701,8 @@ static void PS2E_CALLBACK pcsx2_OSD_WriteLn( int icon, const char* msg )
|
|||
|
||||
PluginManager::PluginManager( const wxString (&folders)[PluginId_Count] )
|
||||
{
|
||||
wxDoNotLogInThisScope please;
|
||||
|
||||
Console.WriteLn( Color_StrongBlue, "Loading plugins..." );
|
||||
|
||||
const PluginInfo* pi = tbl_PluginInfo; do
|
||||
|
@ -734,6 +736,7 @@ PluginManager::PluginManager( const wxString (&folders)[PluginId_Count] )
|
|||
|
||||
_PS2EgetLibName GetLibName = (_PS2EgetLibName) m_info[pid].Lib.GetSymbol( L"PS2EgetLibName" );
|
||||
_PS2EgetLibVersion2 GetLibVersion2 = (_PS2EgetLibVersion2) m_info[pid].Lib.GetSymbol( L"PS2EgetLibVersion2" );
|
||||
_PS2EsetEmuVersion SetEmuVersion = (_PS2EsetEmuVersion) m_info[pid].Lib.GetSymbol( L"PS2EsetEmuVersion" );
|
||||
|
||||
if( GetLibName == NULL || GetLibVersion2 == NULL )
|
||||
throw Exception::PluginLoadError( pid, m_info[pid].Filename,
|
||||
|
@ -741,6 +744,9 @@ PluginManager::PluginManager( const wxString (&folders)[PluginId_Count] )
|
|||
_( "Configured plugin is not a PCSX2 plugin, or is for an older unsupported version of PCSX2." )
|
||||
);
|
||||
|
||||
if( SetEmuVersion != NULL )
|
||||
SetEmuVersion( "PCSX2", (0ul << 24) | (9ul<<16) | (7ul<<8) | 0 );
|
||||
|
||||
m_info[pid].Name = fromUTF8( GetLibName() );
|
||||
int version = GetLibVersion2( tbl_PluginInfo[pid].typemask );
|
||||
m_info[pid].Version.Printf( L"%d.%d.%d", (version>>8)&0xff, version&0xff, (version>>24)&0xff );
|
||||
|
|
|
@ -83,9 +83,8 @@ public:
|
|||
// BadStream - thrown if the provided file is simply not a loadable DLL.
|
||||
// NotEnumerablePlugin - thrown if the DLL is not a PCSX2 plugin, or if it's of an unsupported version.
|
||||
//
|
||||
PluginEnumerator( const wxString& plugpath ) :
|
||||
m_plugpath( plugpath )
|
||||
, m_plugin()
|
||||
PluginEnumerator( const wxString& plugpath )
|
||||
: m_plugpath( plugpath )
|
||||
{
|
||||
if( !m_plugin.Load( m_plugpath ) )
|
||||
throw Exception::BadStream( m_plugpath, "File is not a valid dynamic library." );
|
||||
|
@ -95,7 +94,7 @@ public:
|
|||
m_GetLibName = (_PS2EgetLibName)m_plugin.GetSymbol( L"PS2EgetLibName" );
|
||||
m_GetLibVersion2 = (_PS2EgetLibVersion2)m_plugin.GetSymbol( L"PS2EgetLibVersion2" );
|
||||
|
||||
if( m_GetLibType == NULL || m_GetLibName == NULL || m_GetLibVersion2 == NULL )
|
||||
if( m_GetLibType == NULL || m_GetLibName == NULL || m_GetLibVersion2 == NULL)
|
||||
throw Exception::NotEnumerablePlugin( m_plugpath );
|
||||
|
||||
m_type = m_GetLibType();
|
||||
|
|
|
@ -43,6 +43,8 @@ static bool s_framelimit = true;
|
|||
static bool s_vsync = false;
|
||||
static bool s_exclusive = true;
|
||||
|
||||
static bool s_IsGsOpen2 = false; // boolean to remove some stuff from the config panel in new PCSX2's/
|
||||
|
||||
EXPORT_C_(uint32) PS2EgetLibType()
|
||||
{
|
||||
return PS2E_LT_GS;
|
||||
|
@ -61,6 +63,11 @@ EXPORT_C_(uint32) PS2EgetLibVersion2(uint32 type)
|
|||
return (build << 0) | (revision << 8) | (PS2E_GS_VERSION << 16) | (PLUGIN_VERSION << 24);
|
||||
}
|
||||
|
||||
EXPORT_C_(void) PS2EsetEmuVersion(const char* emuId, uint32 version)
|
||||
{
|
||||
s_IsGsOpen2 = true;
|
||||
}
|
||||
|
||||
EXPORT_C_(uint32) PS2EgetCpuPlatform()
|
||||
{
|
||||
#if _M_AMD64
|
||||
|
@ -386,7 +393,7 @@ EXPORT_C GSconfigure()
|
|||
{
|
||||
if( !GSUtil::CheckSSE() ) return;
|
||||
|
||||
if( GSSettingsDlg().DoModal() == IDOK )
|
||||
if( GSSettingsDlg( s_IsGsOpen2 ).DoModal() == IDOK )
|
||||
{
|
||||
if( s_gs != NULL && s_gs->m_wnd.IsManaged() )
|
||||
{
|
||||
|
@ -462,6 +469,11 @@ EXPORT_C GSgetLastTag(uint32* tag)
|
|||
s_gs->GetLastTag(tag);
|
||||
}
|
||||
|
||||
EXPORT_C GSgetTitleInfo(char dest[128])
|
||||
{
|
||||
//s_gs->GetWindowTitle
|
||||
}
|
||||
|
||||
EXPORT_C GSsetFrameSkip(int frameskip)
|
||||
{
|
||||
s_gs->SetFrameSkip(frameskip);
|
||||
|
|
|
@ -308,7 +308,7 @@ void GSRenderer::VSync(int field)
|
|||
|
||||
// osd
|
||||
|
||||
if((m_perfmon.GetFrame() & 0x1f) == 0)
|
||||
if((m_perfmon.GetFrame() & 0x1f) == 0 && m_wnd.IsManaged())
|
||||
{
|
||||
m_perfmon.Update();
|
||||
|
||||
|
@ -344,12 +344,13 @@ void GSRenderer::VSync(int field)
|
|||
s += " | Recording...";
|
||||
}
|
||||
|
||||
if( !m_wnd.SetWindowText(s.c_str()) )
|
||||
{
|
||||
// [TODO]
|
||||
// We don't have window title rights, or the window has no title,
|
||||
// so let's use actual OSD!
|
||||
}
|
||||
m_wnd.SetWindowText(s.c_str());
|
||||
}
|
||||
else
|
||||
{
|
||||
// [TODO]
|
||||
// We don't have window title rights, or the window has no title,
|
||||
// so let's use actual OSD!
|
||||
}
|
||||
|
||||
if(m_frameskip)
|
||||
|
|
|
@ -71,8 +71,9 @@ GSSetting GSSettingsDlg::g_upscale_multiplier[] =
|
|||
{4, "4x", NULL},
|
||||
};
|
||||
|
||||
GSSettingsDlg::GSSettingsDlg()
|
||||
: GSDialog(IDD_CONFIG)
|
||||
GSSettingsDlg::GSSettingsDlg( bool isOpen2 )
|
||||
: GSDialog(isOpen2 ? IDD_CONFIG2 : IDD_CONFIG)
|
||||
, m_IsOpen2(isOpen2)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -82,6 +83,7 @@ void GSSettingsDlg::OnInit()
|
|||
|
||||
m_modes.clear();
|
||||
|
||||
if(!m_IsOpen2)
|
||||
{
|
||||
D3DDISPLAYMODE mode;
|
||||
memset(&mode, 0, sizeof(mode));
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
class GSSettingsDlg : public GSDialog
|
||||
{
|
||||
list<D3DDISPLAYMODE> m_modes;
|
||||
bool m_IsOpen2;
|
||||
|
||||
void UpdateControls();
|
||||
|
||||
|
@ -35,7 +36,7 @@ protected:
|
|||
bool OnCommand(HWND hWnd, UINT id, UINT code);
|
||||
|
||||
public:
|
||||
GSSettingsDlg();
|
||||
GSSettingsDlg( bool isOpen2 );
|
||||
|
||||
static GSSetting g_renderers[];
|
||||
static GSSetting g_interlace[];
|
||||
|
|
|
@ -8,6 +8,7 @@ EXPORTS
|
|||
PS2EgetLibName
|
||||
PS2EgetLibVersion2
|
||||
PS2EgetCpuPlatform
|
||||
PS2EsetEmuVersion
|
||||
GSsetBaseMem
|
||||
GSinit
|
||||
GSshutdown
|
||||
|
|
|
@ -13,11 +13,11 @@
|
|||
#undef APSTUDIO_READONLY_SYMBOLS
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Hungarian resources
|
||||
// English (U.S.) resources
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
|
||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
#pragma code_page(1252)
|
||||
#endif //_WIN32
|
||||
|
||||
|
@ -52,10 +52,10 @@ END
|
|||
// RCDATA
|
||||
//
|
||||
|
||||
IDR_CONVERT_FX RCDATA "res\\convert.fx"
|
||||
IDR_TFX_FX RCDATA "res\\tfx.fx"
|
||||
IDR_MERGE_FX RCDATA "res\\merge.fx"
|
||||
IDR_INTERLACE_FX RCDATA "res\\interlace.fx"
|
||||
IDR_CONVERT_FX RCDATA "res\\convert.fx"
|
||||
IDR_TFX_FX RCDATA "res\\tfx.fx"
|
||||
IDR_MERGE_FX RCDATA "res\\merge.fx"
|
||||
IDR_INTERLACE_FX RCDATA "res\\interlace.fx"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
|
@ -70,44 +70,44 @@ IDB_LOGO10 BITMAP "res\\logo10.bmp"
|
|||
// Dialog
|
||||
//
|
||||
|
||||
IDD_CONFIG DIALOGEX 0, 0, 189, 298
|
||||
IDD_CONFIG DIALOGEX 0, 0, 189, 295
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Settings..."
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
CONTROL 2022,IDC_LOGO10,"Static",SS_BITMAP,7,7,175,42
|
||||
CONTROL 2021,IDC_LOGO9,"Static",SS_BITMAP,7,7,175,44
|
||||
LTEXT "Resolution:",IDC_STATIC,7,59,37,8
|
||||
COMBOBOX IDC_RESOLUTION,71,57,111,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Renderer:",IDC_STATIC,7,74,34,8
|
||||
COMBOBOX IDC_RENDERER,71,72,111,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Interlacing (F5):",IDC_STATIC,7,90,53,8
|
||||
COMBOBOX IDC_INTERLACE,71,87,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Aspect Ratio (F6):",IDC_STATIC,7,105,60,8
|
||||
COMBOBOX IDC_ASPECTRATIO,71,102,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "D3D internal res:",IDC_STATIC,7,133,55,8
|
||||
EDITTEXT IDC_RESX_EDIT,71,130,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||
CONTROL "",IDC_RESX,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,99,133,11,14
|
||||
EDITTEXT IDC_RESY_EDIT,109,130,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||
CONTROL "",IDC_RESY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,133,133,11,14
|
||||
CONTROL "Native",IDC_NATIVERES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,164,33,10
|
||||
LTEXT "SW rend. threads:",IDC_STATIC,7,181,60,8
|
||||
EDITTEXT IDC_SWTHREADS_EDIT,71,179,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,99,182,11,14
|
||||
CONTROL "Texture filtering",IDC_FILTER,"Button",BS_AUTO3STATE | WS_TABSTOP,7,199,67,10
|
||||
CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,200,58,10
|
||||
CONTROL "Allow 8-bit textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,212,82,10
|
||||
CONTROL "Alpha correction (FBA)",IDC_FBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,213,93,10
|
||||
CONTROL "Wait VSync",IDC_VSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,226,51,10
|
||||
CONTROL "Windowed",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,226,93,10
|
||||
CONTROL "Edge anti-aliasing (AA1, sw-mode only)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,240,141,10
|
||||
CONTROL "Enable output merger blur effect",IDC_BLUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,254,121,10
|
||||
DEFPUSHBUTTON "OK",IDOK,43,277,50,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,96,277,50,14
|
||||
COMBOBOX IDC_UPSCALE_MULTIPLIER,71,145,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Or use Scaling:",IDC_STATIC,7,149,49,8
|
||||
LTEXT "D3D Enhancements (can cause glitches)",IDC_STATIC,31,118,128,8
|
||||
LTEXT "Or use original PS2 resolution :",IDC_STATIC,7,164,99,8
|
||||
LTEXT "Resolution:",IDC_STATIC,7,58,37,8
|
||||
COMBOBOX IDC_RESOLUTION,71,56,111,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Renderer:",IDC_STATIC,7,73,34,8
|
||||
COMBOBOX IDC_RENDERER,71,71,111,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Interlacing (F5):",IDC_STATIC,7,89,53,8
|
||||
COMBOBOX IDC_INTERLACE,71,86,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Aspect Ratio (F6):",IDC_STATIC,7,104,60,8
|
||||
COMBOBOX IDC_ASPECTRATIO,71,101,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "D3D internal res:",IDC_STATIC,7,132,55,8
|
||||
EDITTEXT IDC_RESX_EDIT,71,129,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||
CONTROL "",IDC_RESX,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,99,132,11,14
|
||||
EDITTEXT IDC_RESY_EDIT,109,129,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||
CONTROL "",IDC_RESY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,133,132,11,14
|
||||
CONTROL "Native",IDC_NATIVERES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,112,162,33,10
|
||||
LTEXT "SW rend. threads:",IDC_STATIC,7,178,60,8
|
||||
EDITTEXT IDC_SWTHREADS_EDIT,71,176,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,99,179,11,14
|
||||
CONTROL "Texture filtering",IDC_FILTER,"Button",BS_AUTO3STATE | WS_TABSTOP,7,197,67,10
|
||||
CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,198,58,10
|
||||
CONTROL "Allow 8-bit textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,210,82,10
|
||||
CONTROL "Alpha correction (FBA)",IDC_FBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,211,93,10
|
||||
CONTROL "Wait VSync",IDC_VSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,224,51,10
|
||||
CONTROL "Windowed",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,224,93,10
|
||||
CONTROL "Edge anti-aliasing (AA1, sw-mode only)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,238,141,10
|
||||
CONTROL "Enable output merger blur effect",IDC_BLUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,252,121,10
|
||||
DEFPUSHBUTTON "OK",IDOK,43,275,50,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,96,275,50,14
|
||||
COMBOBOX IDC_UPSCALE_MULTIPLIER,71,144,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Or use Scaling:",IDC_STATIC,7,147,49,8
|
||||
LTEXT "D3D Enhancements (can cause glitches)",IDC_STATIC,31,117,128,8
|
||||
LTEXT "Or use original PS2 resolution :",IDC_STATIC,7,162,99,8
|
||||
END
|
||||
|
||||
IDD_CAPTURE DIALOGEX 0, 0, 279, 71
|
||||
|
@ -153,6 +153,40 @@ BEGIN
|
|||
CONTROL "Windowed",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,129,157,49,10
|
||||
END
|
||||
|
||||
IDD_CONFIG2 DIALOGEX 0, 0, 187, 258
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Settings..."
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
CONTROL 2022,IDC_LOGO10,"Static",SS_BITMAP,6,6,173,42
|
||||
DEFPUSHBUTTON "OK",IDOK,41,239,50,14
|
||||
LTEXT "Renderer:",IDC_STATIC,6,57,34,8
|
||||
COMBOBOX IDC_RENDERER,70,55,111,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Interlacing (F5):",IDC_STATIC,6,73,53,8
|
||||
COMBOBOX IDC_INTERLACE,70,70,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "D3D internal res:",IDC_STATIC,6,105,55,8
|
||||
EDITTEXT IDC_RESX_EDIT,70,102,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||
CONTROL "",IDC_RESX,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,98,105,11,14
|
||||
EDITTEXT IDC_RESY_EDIT,108,102,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||
CONTROL "",IDC_RESY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,132,105,11,14
|
||||
CONTROL "Native",IDC_NATIVERES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,111,135,33,10
|
||||
LTEXT "SW rend. threads:",IDC_STATIC,6,151,60,8
|
||||
EDITTEXT IDC_SWTHREADS_EDIT,70,149,35,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,98,152,11,14
|
||||
COMBOBOX IDC_UPSCALE_MULTIPLIER,70,117,111,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Or use Scaling:",IDC_STATIC,6,120,49,8
|
||||
LTEXT "D3D Enhancements (can cause glitches)",IDC_STATIC,30,90,128,8
|
||||
LTEXT "Or use original PS2 resolution :",IDC_STATIC,6,135,99,8
|
||||
CONTROL "Texture filtering",IDC_FILTER,"Button",BS_AUTO3STATE | WS_TABSTOP,6,174,67,10
|
||||
CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,88,175,58,10
|
||||
CONTROL "Allow 8-bit textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,188,82,10
|
||||
CONTROL "Alpha correction (FBA)",IDC_FBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,88,188,93,10
|
||||
CONTROL "Edge anti-aliasing (AA1, sw-mode only)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,202,141,10
|
||||
CONTROL "Enable output merger blur effect",IDC_BLUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,216,121,10
|
||||
PUSHBUTTON "Cancel",IDCANCEL,95,239,50,14
|
||||
CONTROL 2021,IDC_LOGO9,"Static",SS_BITMAP,6,6,175,44
|
||||
END
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
|
@ -170,7 +204,7 @@ BEGIN
|
|||
VERTGUIDE, 89
|
||||
VERTGUIDE, 182
|
||||
TOPMARGIN, 7
|
||||
BOTTOMMARGIN, 291
|
||||
BOTTOMMARGIN, 288
|
||||
HORZGUIDE, 49
|
||||
END
|
||||
|
||||
|
@ -191,6 +225,14 @@ BEGIN
|
|||
TOPMARGIN, 7
|
||||
BOTTOMMARGIN, 192
|
||||
END
|
||||
|
||||
IDD_CONFIG2, DIALOG
|
||||
BEGIN
|
||||
LEFTMARGIN, 6
|
||||
RIGHTMARGIN, 181
|
||||
TOPMARGIN, 6
|
||||
BOTTOMMARGIN, 252
|
||||
END
|
||||
END
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
|
@ -248,3 +290,4 @@ END
|
|||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#endif // not APSTUDIO_INVOKED
|
||||
|
||||
|
|
|
@ -46,12 +46,14 @@
|
|||
#define IDR_TFX_FX 10001
|
||||
#define IDR_MERGE_FX 10002
|
||||
#define IDR_INTERLACE_FX 10003
|
||||
#define IDD_COINFIG2 10004
|
||||
#define IDD_CONFIG2 10004
|
||||
|
||||
// Next default values for new objects
|
||||
//
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
#ifndef APSTUDIO_READONLY_SYMBOLS
|
||||
#define _APS_NEXT_RESOURCE_VALUE 10004
|
||||
#define _APS_NEXT_RESOURCE_VALUE 10005
|
||||
#define _APS_NEXT_COMMAND_VALUE 32771
|
||||
#define _APS_NEXT_CONTROL_VALUE 2040
|
||||
#define _APS_NEXT_SYMED_VALUE 5000
|
||||
|
|
Loading…
Reference in New Issue