merge opengl core and direct3d9on12 into renderer= setting
This commit is contained in:
FunkyFr3sh
parent
63c13d8a63
commit
54f23331e8
4 changed files with 234 additions and 218 deletions
|
|
@ -597,7 +597,15 @@ void __fastcall TConfigForm::FormCreate(TObject *Sender)
|
|||
|
||||
auto renderer = LowerCase(ini->ReadString("ddraw", "renderer", "auto"));
|
||||
|
||||
if (StartsStr("d", renderer)) {
|
||||
if (renderer == "direct3d9on12") {
|
||||
RendererCbx->AddItem(L"Direct3D 12 (9On12)", NULL);
|
||||
RendererCbx->ItemIndex = 4;
|
||||
}
|
||||
else if (renderer == "openglcore") {
|
||||
RendererCbx->AddItem(L"OpenGL Core", NULL);
|
||||
RendererCbx->ItemIndex = 4;
|
||||
}
|
||||
else if (StartsStr("d", renderer)) {
|
||||
RendererCbx->ItemIndex = 1;
|
||||
}
|
||||
else if (StartsStr("o", renderer)) {
|
||||
|
|
@ -767,6 +775,14 @@ void TConfigForm::SaveSettings()
|
|||
case 3:
|
||||
ini->WriteString("ddraw", "renderer", "gdi");
|
||||
break;
|
||||
case 4:
|
||||
if (RendererCbx->Text == "OpenGL Core") {
|
||||
ini->WriteString("ddraw", "renderer", "openglcore");
|
||||
}
|
||||
else {
|
||||
ini->WriteString("ddraw", "renderer", "direct3d9on12");
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2681,200 +2681,6 @@ object ConfigForm: TConfigForm
|
|||
OnActivate = FormActivate
|
||||
OnCreate = FormCreate
|
||||
TextHeight = 13
|
||||
object AdvancedPnl: TPanel
|
||||
Left = 233
|
||||
Top = 8
|
||||
Width = 499
|
||||
Height = 465
|
||||
BevelOuter = bvNone
|
||||
Color = clWhite
|
||||
ParentBackground = False
|
||||
ShowCaption = False
|
||||
TabOrder = 2
|
||||
Visible = False
|
||||
StyleElements = [seFont, seBorder]
|
||||
object RendererLbl: TLabel
|
||||
Left = 40
|
||||
Top = 28
|
||||
Width = 64
|
||||
Height = 21
|
||||
Caption = 'Renderer'
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -16
|
||||
Font.Name = 'Segoe UI'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
StyleElements = [seClient, seBorder]
|
||||
end
|
||||
object SavesettingsLbl: TLabel
|
||||
Left = 40
|
||||
Top = 386
|
||||
Width = 256
|
||||
Height = 21
|
||||
Margins.Top = 18
|
||||
Caption = 'Remember window position and size'
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -16
|
||||
Font.Name = 'Segoe UI'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
StyleElements = [seClient, seBorder]
|
||||
end
|
||||
object ShaderLbl: TLabel
|
||||
Left = 40
|
||||
Top = 105
|
||||
Width = 108
|
||||
Height = 21
|
||||
Margins.Top = 18
|
||||
Caption = 'OpenGL shader'
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -16
|
||||
Font.Name = 'Segoe UI'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
StyleElements = [seClient, seBorder]
|
||||
end
|
||||
object MaxfpsLbl: TLabel
|
||||
Left = 40
|
||||
Top = 182
|
||||
Width = 111
|
||||
Height = 21
|
||||
Margins.Top = 18
|
||||
Caption = 'Limit frame rate'
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -16
|
||||
Font.Name = 'Segoe UI'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
StyleElements = [seClient, seBorder]
|
||||
end
|
||||
object BorderLbl: TLabel
|
||||
Left = 40
|
||||
Top = 318
|
||||
Width = 293
|
||||
Height = 21
|
||||
Margins.Top = 18
|
||||
Caption = 'Show window borders in windowed mode'
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -16
|
||||
Font.Name = 'Segoe UI'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
StyleElements = [seClient, seBorder]
|
||||
end
|
||||
object BoxingLbl: TLabel
|
||||
Left = 40
|
||||
Top = 250
|
||||
Width = 267
|
||||
Height = 21
|
||||
Margins.Top = 18
|
||||
Caption = 'Enable windowboxing / integer scaling'
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -16
|
||||
Font.Name = 'Segoe UI'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
StyleElements = [seClient, seBorder]
|
||||
end
|
||||
object RendererPbox: TPaintBox
|
||||
Left = 40
|
||||
Top = 54
|
||||
Width = 207
|
||||
Height = 31
|
||||
OnPaint = PboxPaint
|
||||
end
|
||||
object ShaderPbox: TPaintBox
|
||||
Left = 40
|
||||
Top = 131
|
||||
Width = 427
|
||||
Height = 31
|
||||
OnPaint = PboxPaint
|
||||
end
|
||||
object RendererCbx: TComboBox
|
||||
Left = 41
|
||||
Top = 55
|
||||
Width = 205
|
||||
Height = 29
|
||||
BevelEdges = []
|
||||
BevelInner = bvNone
|
||||
BevelOuter = bvSpace
|
||||
Style = csDropDownList
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -16
|
||||
Font.Name = 'Segoe UI'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
TabOrder = 0
|
||||
OnChange = RendererCbxChange
|
||||
Items.Strings = (
|
||||
'Automatic'
|
||||
'Direct3D 9'
|
||||
'OpenGL'
|
||||
'GDI')
|
||||
end
|
||||
object BorderChk: TToggleSwitch
|
||||
Left = 40
|
||||
Top = 345
|
||||
Width = 50
|
||||
Height = 20
|
||||
ShowStateCaption = False
|
||||
TabOrder = 1
|
||||
OnClick = BorderChkClick
|
||||
end
|
||||
object SavesettingsChk: TToggleSwitch
|
||||
Left = 40
|
||||
Top = 413
|
||||
Width = 50
|
||||
Height = 20
|
||||
ShowStateCaption = False
|
||||
TabOrder = 2
|
||||
OnClick = SavesettingsChkClick
|
||||
end
|
||||
object ShaderCbx: TComboBox
|
||||
Left = 41
|
||||
Top = 132
|
||||
Width = 425
|
||||
Height = 29
|
||||
BevelEdges = []
|
||||
BevelInner = bvNone
|
||||
BevelOuter = bvSpace
|
||||
Style = csDropDownList
|
||||
DropDownCount = 10
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -16
|
||||
Font.Name = 'Segoe UI'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
TabOrder = 3
|
||||
OnChange = ShaderCbxChange
|
||||
end
|
||||
object MaxfpsChk: TToggleSwitch
|
||||
Left = 40
|
||||
Top = 209
|
||||
Width = 50
|
||||
Height = 20
|
||||
ShowStateCaption = False
|
||||
TabOrder = 4
|
||||
OnClick = MaxfpsChkClick
|
||||
end
|
||||
object BoxingChk: TToggleSwitch
|
||||
Left = 40
|
||||
Top = 277
|
||||
Width = 50
|
||||
Height = 20
|
||||
ShowStateCaption = False
|
||||
TabOrder = 5
|
||||
OnClick = BoxingChkClick
|
||||
end
|
||||
end
|
||||
object DisplayPnl: TPanel
|
||||
Left = 233
|
||||
Top = 8
|
||||
|
|
@ -3245,6 +3051,200 @@ object ConfigForm: TConfigForm
|
|||
OnClick = NonexclusiveChkClick
|
||||
end
|
||||
end
|
||||
object AdvancedPnl: TPanel
|
||||
Left = 233
|
||||
Top = 8
|
||||
Width = 499
|
||||
Height = 465
|
||||
BevelOuter = bvNone
|
||||
Color = clWhite
|
||||
ParentBackground = False
|
||||
ShowCaption = False
|
||||
TabOrder = 2
|
||||
Visible = False
|
||||
StyleElements = [seFont, seBorder]
|
||||
object RendererLbl: TLabel
|
||||
Left = 40
|
||||
Top = 28
|
||||
Width = 64
|
||||
Height = 21
|
||||
Caption = 'Renderer'
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -16
|
||||
Font.Name = 'Segoe UI'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
StyleElements = [seClient, seBorder]
|
||||
end
|
||||
object SavesettingsLbl: TLabel
|
||||
Left = 40
|
||||
Top = 386
|
||||
Width = 256
|
||||
Height = 21
|
||||
Margins.Top = 18
|
||||
Caption = 'Remember window position and size'
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -16
|
||||
Font.Name = 'Segoe UI'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
StyleElements = [seClient, seBorder]
|
||||
end
|
||||
object ShaderLbl: TLabel
|
||||
Left = 40
|
||||
Top = 105
|
||||
Width = 108
|
||||
Height = 21
|
||||
Margins.Top = 18
|
||||
Caption = 'OpenGL shader'
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -16
|
||||
Font.Name = 'Segoe UI'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
StyleElements = [seClient, seBorder]
|
||||
end
|
||||
object MaxfpsLbl: TLabel
|
||||
Left = 40
|
||||
Top = 182
|
||||
Width = 111
|
||||
Height = 21
|
||||
Margins.Top = 18
|
||||
Caption = 'Limit frame rate'
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -16
|
||||
Font.Name = 'Segoe UI'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
StyleElements = [seClient, seBorder]
|
||||
end
|
||||
object BorderLbl: TLabel
|
||||
Left = 40
|
||||
Top = 318
|
||||
Width = 293
|
||||
Height = 21
|
||||
Margins.Top = 18
|
||||
Caption = 'Show window borders in windowed mode'
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -16
|
||||
Font.Name = 'Segoe UI'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
StyleElements = [seClient, seBorder]
|
||||
end
|
||||
object BoxingLbl: TLabel
|
||||
Left = 40
|
||||
Top = 250
|
||||
Width = 267
|
||||
Height = 21
|
||||
Margins.Top = 18
|
||||
Caption = 'Enable windowboxing / integer scaling'
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -16
|
||||
Font.Name = 'Segoe UI'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
StyleElements = [seClient, seBorder]
|
||||
end
|
||||
object RendererPbox: TPaintBox
|
||||
Left = 40
|
||||
Top = 54
|
||||
Width = 207
|
||||
Height = 31
|
||||
OnPaint = PboxPaint
|
||||
end
|
||||
object ShaderPbox: TPaintBox
|
||||
Left = 40
|
||||
Top = 131
|
||||
Width = 427
|
||||
Height = 31
|
||||
OnPaint = PboxPaint
|
||||
end
|
||||
object RendererCbx: TComboBox
|
||||
Left = 41
|
||||
Top = 55
|
||||
Width = 205
|
||||
Height = 29
|
||||
BevelEdges = []
|
||||
BevelInner = bvNone
|
||||
BevelOuter = bvSpace
|
||||
Style = csDropDownList
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -16
|
||||
Font.Name = 'Segoe UI'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
TabOrder = 0
|
||||
OnChange = RendererCbxChange
|
||||
Items.Strings = (
|
||||
'Automatic'
|
||||
'Direct3D 9'
|
||||
'OpenGL'
|
||||
'GDI')
|
||||
end
|
||||
object BorderChk: TToggleSwitch
|
||||
Left = 40
|
||||
Top = 345
|
||||
Width = 50
|
||||
Height = 20
|
||||
ShowStateCaption = False
|
||||
TabOrder = 1
|
||||
OnClick = BorderChkClick
|
||||
end
|
||||
object SavesettingsChk: TToggleSwitch
|
||||
Left = 40
|
||||
Top = 413
|
||||
Width = 50
|
||||
Height = 20
|
||||
ShowStateCaption = False
|
||||
TabOrder = 2
|
||||
OnClick = SavesettingsChkClick
|
||||
end
|
||||
object ShaderCbx: TComboBox
|
||||
Left = 41
|
||||
Top = 132
|
||||
Width = 425
|
||||
Height = 29
|
||||
BevelEdges = []
|
||||
BevelInner = bvNone
|
||||
BevelOuter = bvSpace
|
||||
Style = csDropDownList
|
||||
DropDownCount = 10
|
||||
Font.Charset = DEFAULT_CHARSET
|
||||
Font.Color = clWindowText
|
||||
Font.Height = -16
|
||||
Font.Name = 'Segoe UI'
|
||||
Font.Style = []
|
||||
ParentFont = False
|
||||
TabOrder = 3
|
||||
OnChange = ShaderCbxChange
|
||||
end
|
||||
object MaxfpsChk: TToggleSwitch
|
||||
Left = 40
|
||||
Top = 209
|
||||
Width = 50
|
||||
Height = 20
|
||||
ShowStateCaption = False
|
||||
TabOrder = 4
|
||||
OnClick = MaxfpsChkClick
|
||||
end
|
||||
object BoxingChk: TToggleSwitch
|
||||
Left = 40
|
||||
Top = 277
|
||||
Width = 50
|
||||
Height = 20
|
||||
ShowStateCaption = False
|
||||
TabOrder = 5
|
||||
OnClick = BoxingChkClick
|
||||
end
|
||||
end
|
||||
object MenuPnl: TPanel
|
||||
Left = 0
|
||||
Top = 8
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue