mirror of
https://github.com/LIV2/WinUAE.git
synced 2025-12-06 00:12:52 +00:00
3600b10
This commit is contained in:
Toni Wilen
parent
ac3c09b7ed
commit
d942125819
@ -36,6 +36,7 @@
|
||||
// ROM expansion board diagrom call
|
||||
// 00F83B7C 3.1 A4000
|
||||
// 00F83C96 3.1 A1200
|
||||
// 00FC4E28 1.3
|
||||
|
||||
#define MAPROM_DEBUG 0
|
||||
#define PPC_IRQ_DEBUG 0
|
||||
|
||||
14
custom.cpp
14
custom.cpp
@ -10025,6 +10025,13 @@ uae_u8 *restore_custom_extra (uae_u8 *src)
|
||||
currprefs.cs_resetwarning = changed_prefs.cs_resetwarning = RBB;
|
||||
currprefs.cs_z3autoconfig = changed_prefs.cs_z3autoconfig = RBB;
|
||||
currprefs.cs_1mchipjumper = changed_prefs.cs_1mchipjumper = RBB;
|
||||
currprefs.cs_bytecustomwritebug = changed_prefs.cs_bytecustomwritebug = RBB;
|
||||
currprefs.cs_color_burst = changed_prefs.cs_color_burst = RBB;
|
||||
currprefs.cs_toshibagary = changed_prefs.cs_toshibagary = RBB;
|
||||
currprefs.cs_romisslow = changed_prefs.cs_romisslow = RBB;
|
||||
|
||||
currprefs.cs_ciatype[0] = changed_prefs.cs_ciatype[0] = RBB;
|
||||
currprefs.cs_ciatype[1] = changed_prefs.cs_ciatype[1] = RBB;
|
||||
|
||||
return src;
|
||||
}
|
||||
@ -10079,6 +10086,13 @@ uae_u8 *save_custom_extra (int *len, uae_u8 *dstptr)
|
||||
SB (currprefs.cs_z3autoconfig ? 1 : 0);
|
||||
SB (currprefs.cs_1mchipjumper ? 1 : 0);
|
||||
|
||||
SB(currprefs.cs_bytecustomwritebug ? 1 : 0);
|
||||
SB(currprefs.cs_color_burst ? 1 : 0);
|
||||
SB(currprefs.cs_toshibagary ? 1 : 0);
|
||||
SB(currprefs.cs_ciatype[0]);
|
||||
SB(currprefs.cs_ciatype[1]);
|
||||
|
||||
|
||||
*len = dst - dstbak;
|
||||
return dstbak;
|
||||
}
|
||||
|
||||
17
disk.cpp
17
disk.cpp
@ -170,6 +170,7 @@ typedef struct {
|
||||
bool motoroff;
|
||||
int motordelay; /* dskrdy needs some clock cycles before it changes after switching off motor */
|
||||
bool state;
|
||||
int selected_delay;
|
||||
bool wrprot;
|
||||
bool forcedwrprot;
|
||||
uae_u16 bigmfmbuf[0x4000 * DDHDMULT];
|
||||
@ -752,6 +753,7 @@ static void update_drive_gui (int num, bool force)
|
||||
else
|
||||
gui_data.drive_side = side;
|
||||
gui_data.drive_writing[num] = writ;
|
||||
//write_log(_T("%d %d\n"), num, (gui_data.drive_motor[num] ? 1 : 0) | (gui_data.drive_writing[num] ? 2 : 0));
|
||||
gui_led (num + LED_DF0, (gui_data.drive_motor[num] ? 1 : 0) | (gui_data.drive_writing[num] ? 2 : 0), -1);
|
||||
}
|
||||
|
||||
@ -2893,6 +2895,9 @@ void DISK_vsync (void)
|
||||
DISK_check_change ();
|
||||
for (int i = 0; i < MAX_FLOPPY_DRIVES; i++) {
|
||||
drive *drv = floppy + i;
|
||||
if (drv->selected_delay > 0) {
|
||||
drv->selected_delay--;
|
||||
}
|
||||
if (drv->dskchange_time == 0 && _tcscmp (currprefs.floppyslots[i].df, changed_prefs.floppyslots[i].df))
|
||||
disk_insert (i, changed_prefs.floppyslots[i].df, changed_prefs.floppyslots[i].forcedwriteprotect);
|
||||
}
|
||||
@ -3064,7 +3069,17 @@ void DISK_select (uae_u8 data)
|
||||
}
|
||||
|
||||
for (dr = 0; dr < MAX_FLOPPY_DRIVES; dr++) {
|
||||
floppy[dr].state = (!(selected & (1 << dr))) | !floppy[dr].motoroff;
|
||||
// selected
|
||||
if (!(selected & (1 << dr)) && floppy[dr].selected_delay < 0) {
|
||||
floppy[dr].selected_delay = 2;
|
||||
}
|
||||
// not selected
|
||||
if ((selected & (1 << dr))) {
|
||||
floppy[dr].selected_delay = -1;
|
||||
}
|
||||
// external drives usually (always?) light activity led when selected. Internal only when motor is running.
|
||||
bool selected_led = !(selected & (1 << dr)) && floppy[dr].selected_delay == 0 && dr > 0;
|
||||
floppy[dr].state = selected_led || !floppy[dr].motoroff;
|
||||
update_drive_gui (dr, false);
|
||||
}
|
||||
prev_data = data;
|
||||
|
||||
@ -1133,6 +1133,7 @@
|
||||
#define IDC_DBG_MEMTOPC 1759
|
||||
#define IDC_CS_ROMISSLOW 1759
|
||||
#define IDC_DBG_MEMUPFAST 1760
|
||||
#define IDC_CS_CIA 1760
|
||||
#define IDC_DA_RESET 1761
|
||||
#define IDC_DBG_STATUS 1762
|
||||
#define IDC_DBG_BRKPTS 1763
|
||||
|
||||
@ -780,31 +780,31 @@ BEGIN
|
||||
CONTROL "Power Supply 50Hz",IDC_CS_CIAA_TOD2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,133,63,109,10
|
||||
CONTROL "Power Supply 60Hz",IDC_CS_CIAA_TOD3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,248,63,116,10
|
||||
GROUPBOX "Chipset Features",IDC_STATIC,0,82,395,148
|
||||
CONTROL "CIA ROM Overlay",IDC_CS_CIAOVERLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,95,104,11
|
||||
CONTROL "CD32 CD",IDC_CS_CD32CD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,108,104,11
|
||||
CONTROL "CDTV CD",IDC_CS_CDTVCD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,121,105,11
|
||||
CONTROL "A600/A1200 IDE",IDC_CS_IDE1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,134,104,11
|
||||
CONTROL "ROM Mirror (E0)",IDC_CS_KSMIRROR_E0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,147,104,11
|
||||
CONTROL "KB Reset Warning",IDC_CS_RESETWARNING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,160,104,11
|
||||
CONTROL "CIA TOD bug",IDC_CS_CIATODBUG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,173,104,11
|
||||
CONTROL "1M Chip / 0.5M+0.5M",IDC_CS_1MCHIPJUMPER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,186,104,11
|
||||
CONTROL "A1000 Boot RAM/ROM",IDC_CS_A1000RAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,95,121,11
|
||||
CONTROL "CD32 C2P",IDC_CS_CD32C2P,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,108,121,11
|
||||
CONTROL "CDTV SRAM",IDC_CS_CDTVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,121,121,11
|
||||
CONTROL "A4000/A4000T IDE",IDC_CS_IDE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,134,121,11
|
||||
CONTROL "ROM Mirror (A8)",IDC_CS_KSMIRROR_A8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,147,121,11
|
||||
CONTROL "No-EHB Denise",IDC_CS_NOEHB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,160,121,11
|
||||
CONTROL "Z3 Autoconfig",IDC_CS_Z3AUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,173,104,11
|
||||
CONTROL "CIA ROM Overlay",IDC_CS_CIAOVERLAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,93,104,11
|
||||
CONTROL "CD32 CD",IDC_CS_CD32CD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,104,11
|
||||
CONTROL "CDTV CD",IDC_CS_CDTVCD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,119,105,11
|
||||
CONTROL "A600/A1200 IDE",IDC_CS_IDE1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,132,104,11
|
||||
CONTROL "ROM Mirror (E0)",IDC_CS_KSMIRROR_E0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,145,104,11
|
||||
CONTROL "KB Reset Warning",IDC_CS_RESETWARNING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,158,104,11
|
||||
CONTROL "CIA TOD bug",IDC_CS_CIATODBUG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,171,104,11
|
||||
CONTROL "1M Chip / 0.5M+0.5M",IDC_CS_1MCHIPJUMPER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,184,104,11
|
||||
CONTROL "A1000 Boot RAM/ROM",IDC_CS_A1000RAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,93,121,11
|
||||
CONTROL "CD32 C2P",IDC_CS_CD32C2P,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,106,121,11
|
||||
CONTROL "CDTV SRAM",IDC_CS_CDTVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,119,121,11
|
||||
CONTROL "A4000/A4000T IDE",IDC_CS_IDE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,132,121,11
|
||||
CONTROL "ROM Mirror (A8)",IDC_CS_KSMIRROR_A8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,145,121,11
|
||||
CONTROL "No-EHB Denise",IDC_CS_NOEHB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,158,121,11
|
||||
CONTROL "Z3 Autoconfig",IDC_CS_Z3AUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,171,104,11
|
||||
CONTROL "Custom register byte write bug",IDC_CS_BYTECUSTOMWRITEBUG,
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,186,130,11
|
||||
CONTROL "DF0: ID Hardware",IDC_CS_DF0IDHW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,95,125,11
|
||||
CONTROL "CD32 NVRAM",IDC_CS_CD32NVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,108,125,11
|
||||
CONTROL "CDTV SRAM Expansion",IDC_CS_CDTVRAMEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,121,125,11
|
||||
CONTROL "CDTV-CR",IDC_CS_CDTVCR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,134,123,11
|
||||
CONTROL "PCMCIA",IDC_CS_PCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,147,125,11
|
||||
CONTROL "C00000 is Fast RAM",IDC_CS_SLOWISFAST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,160,125,11
|
||||
CONTROL "A1000 Agnus (8361/8367)",IDC_CS_DIPAGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,173,125,11
|
||||
CONTROL "Composite color burst",IDC_CS_COMPOSITECOLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,186,125,12
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,184,130,11
|
||||
CONTROL "DF0: ID Hardware",IDC_CS_DF0IDHW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,93,125,11
|
||||
CONTROL "CD32 NVRAM",IDC_CS_CD32NVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,106,125,11
|
||||
CONTROL "CDTV SRAM Expansion",IDC_CS_CDTVRAMEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,119,125,11
|
||||
CONTROL "CDTV-CR",IDC_CS_CDTVCR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,132,123,11
|
||||
CONTROL "PCMCIA",IDC_CS_PCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,145,125,11
|
||||
CONTROL "C00000 is Fast RAM",IDC_CS_SLOWISFAST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,158,125,11
|
||||
CONTROL "A1000 Agnus (8361/8367)",IDC_CS_DIPAGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,171,125,11
|
||||
CONTROL "Composite color burst",IDC_CS_COMPOSITECOLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,184,125,12
|
||||
GROUPBOX "Internal SCSI Hardware",IDC_STATIC,0,232,395,30
|
||||
CONTROL "A3000 WD33C93 SCSI",IDC_CS_DMAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,247,108,11
|
||||
CONTROL "A4000T NCR53C710 SCSI",IDC_CS_DMAC2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,130,247,125,11
|
||||
@ -818,10 +818,12 @@ BEGIN
|
||||
CONTROL "Denise/Lisa revision:",IDC_CS_DENISE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,299,107,11
|
||||
EDITTEXT IDC_CS_AGNUSREV,311,284,45,13,ES_AUTOHSCROLL
|
||||
EDITTEXT IDC_CS_DENISEREV,311,298,45,13,ES_AUTOHSCROLL
|
||||
COMBOBOX IDC_CS_UNMAPPED,126,199,113,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
RTEXT "Unmapped address space:",IDC_STATIC,15,202,101,9
|
||||
CONTROL "Toshiba Gary",IDC_CS_TOSHIBAGARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,200,125,12
|
||||
CONTROL "KS ROM has Chip RAM speed",IDC_CS_ROMISSLOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,214,125,12
|
||||
COMBOBOX IDC_CS_UNMAPPED,125,212,113,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
RTEXT "Unmapped address space:",IDC_STATIC,15,215,101,9
|
||||
CONTROL "Toshiba Gary",IDC_CS_TOSHIBAGARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,197,125,12
|
||||
CONTROL "KS ROM has Chip RAM speed",IDC_CS_ROMISSLOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,198,125,12
|
||||
CONTROL "CIA 391078-01 [] CIA revision that can't read IO pin status in output mode",IDC_CS_CIA,
|
||||
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,198,125,12
|
||||
END
|
||||
|
||||
IDD_AVIOUTPUT DIALOGEX 0, 0, 396, 260
|
||||
|
||||
@ -20,12 +20,12 @@
|
||||
#define LANG_DLL_FULL_VERSION_MATCH 1
|
||||
|
||||
#if WINUAEPUBLICBETA
|
||||
#define WINUAEBETA _T("9")
|
||||
#define WINUAEBETA _T("10")
|
||||
#else
|
||||
#define WINUAEBETA _T("")
|
||||
#endif
|
||||
|
||||
#define WINUAEDATE MAKEBD(2017, 12, 2)
|
||||
#define WINUAEDATE MAKEBD(2017, 12, 4)
|
||||
|
||||
//#define WINUAEEXTRA _T("AmiKit Preview")
|
||||
//#define WINUAEEXTRA _T("Amiga Forever Edition")
|
||||
|
||||
@ -8140,6 +8140,7 @@ static void values_to_chipsetdlg2 (HWND hDlg)
|
||||
CheckDlgButton(hDlg, IDC_CS_COMPOSITECOLOR, workprefs.cs_color_burst);
|
||||
CheckDlgButton(hDlg, IDC_CS_TOSHIBAGARY, workprefs.cs_toshibagary);
|
||||
CheckDlgButton(hDlg, IDC_CS_ROMISSLOW, workprefs.cs_romisslow);
|
||||
CheckDlgButton(hDlg, IDC_CS_CIA, workprefs.cs_ciatype[0]);
|
||||
SendDlgItemMessage(hDlg, IDC_CS_UNMAPPED, CB_SETCURSEL, workprefs.cs_unmapped_space, 0);
|
||||
txt[0] = 0;
|
||||
_stprintf (txt, _T("%d"), workprefs.cs_rtc_adjust);
|
||||
@ -8233,6 +8234,7 @@ static void values_from_chipsetdlg2 (HWND hDlg, UINT msg, WPARAM wParam, LPARAM
|
||||
workprefs.cs_color_burst = ischecked(hDlg, IDC_CS_COMPOSITECOLOR);
|
||||
workprefs.cs_toshibagary = ischecked(hDlg, IDC_CS_TOSHIBAGARY);
|
||||
workprefs.cs_romisslow = ischecked(hDlg, IDC_CS_ROMISSLOW);
|
||||
workprefs.cs_ciatype[0] = workprefs.cs_ciatype[1] = ischecked(hDlg, IDC_CS_CIA);
|
||||
LRESULT val = SendDlgItemMessage(hDlg, IDC_CS_UNMAPPED, CB_GETCURSEL, 0, 0L);
|
||||
if (val != CB_ERR)
|
||||
workprefs.cs_unmapped_space = val;
|
||||
@ -8325,6 +8327,7 @@ static void enable_for_chipsetdlg2 (HWND hDlg)
|
||||
ew(hDlg, IDC_CS_TOSHIBAGARY, e);
|
||||
ew(hDlg, IDC_CS_ROMISSLOW, e);
|
||||
ew(hDlg, IDC_CS_UNMAPPED, e);
|
||||
ew(hDlg, IDC_CS_CIA, e);
|
||||
}
|
||||
|
||||
static INT_PTR CALLBACK ChipsetDlgProc2 (HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
|
||||
@ -19646,6 +19649,8 @@ static bool dodialogmousemove (void)
|
||||
return false;
|
||||
if (isfullscreen () > 0 && currprefs.gfx_size_fs.width > gui_width && currprefs.gfx_size.height > gui_height)
|
||||
return false;
|
||||
if (currprefs.gfx_api == 2)
|
||||
return false;
|
||||
struct MultiDisplay *mdc = getdisplay (&currprefs);
|
||||
for (int i = 0; Displays[i].monitorid; i++) {
|
||||
struct MultiDisplay *md = &Displays[i];
|
||||
@ -20613,7 +20618,6 @@ static int GetSettings (int all_options, HWND hwnd)
|
||||
MapDialogRect (dhwnd, &dialog_rect);
|
||||
|
||||
hGUIWnd = dhwnd;
|
||||
flipgui(2);
|
||||
|
||||
for (;;) {
|
||||
HANDLE IPChandle;
|
||||
|
||||
@ -181,6 +181,22 @@
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'">
|
||||
<IgnoreImportLibrary>
|
||||
</IgnoreImportLibrary>
|
||||
<ExecutablePath>C:\Program Files (x86)\Windows Kits\10\bin\x86;$(ExecutablePath)</ExecutablePath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">
|
||||
<ExecutablePath>C:\Program Files (x86)\Windows Kits\10\bin\x86;$(ExecutablePath)</ExecutablePath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ExecutablePath>C:\Program Files (x86)\Windows Kits\10\bin\x86;$(ExecutablePath)</ExecutablePath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
|
||||
<ExecutablePath>C:\Program Files (x86)\Windows Kits\10\bin\x86;$(ExecutablePath)</ExecutablePath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">
|
||||
<ExecutablePath>C:\Program Files (x86)\Windows Kits\10\bin\x86;$(ExecutablePath)</ExecutablePath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ExecutablePath>C:\Program Files (x86)\Windows Kits\10\bin\x86;$(ExecutablePath)</ExecutablePath>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Midl>
|
||||
@ -1142,6 +1158,250 @@
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\resources\resource.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<FxCompile Include="..\shaders\PixelShader.hlsl">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Test|x64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">true</ExcludedFromBuild>
|
||||
</FxCompile>
|
||||
<FxCompile Include="..\shaders\PixelShaderAlpha.hlsl">
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">PS_PostAlpha</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">4.0</ShaderModel>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">PS_PostAlpha</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">../Shaders/PixelShaderAlpha.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">
|
||||
</ObjectFileOutput>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../Shaders/PixelShaderAlpha.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">PS_PostAlpha</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">../Shaders/PixelShaderAlpha.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">PS_PostAlpha</VariableName>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PS_PostAlpha</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../Shaders/PixelShaderAlpha.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</ObjectFileOutput>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PS_PostAlpha</EntryPointName>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">PS_PostAlpha</EntryPointName>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">PS_PostAlpha</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4.0</ShaderModel>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4.0</ShaderModel>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">4.0</ShaderModel>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PS_PostAlpha</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.0</ShaderModel>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Test|x64'">PS_PostAlpha</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Test|x64'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Test|x64'">4.0</ShaderModel>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">PS_PostAlpha</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4.0</ShaderModel>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">PS_PostAlpha</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">4.0</ShaderModel>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PS_PostAlpha</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../Shaders/PixelShaderAlpha.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Test|x64'">PS_PostAlpha</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Test|x64'">../Shaders/PixelShaderAlpha.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Test|x64'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">PS_PostAlpha</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../Shaders/PixelShaderAlpha.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">PS_PostAlpha</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">../Shaders/PixelShaderAlpha.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">
|
||||
</ObjectFileOutput>
|
||||
</FxCompile>
|
||||
<FxCompile Include="..\shaders\PixelShaderMask.hlsl">
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">PS_PostMask</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">4.0</ShaderModel>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">PS_PostMask</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">../Shaders/PixelShaderMask.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">
|
||||
</ObjectFileOutput>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4.0</ShaderModel>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4.0</ShaderModel>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">4.0</ShaderModel>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PS_PostMask</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../Shaders/PixelShaderMask.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">PS_PostMask</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../Shaders/PixelShaderMask.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">PS_PostMask</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">../Shaders/PixelShaderMask.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PS_PostMask</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../Shaders/PixelShaderMask.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Test|x64'">PS_PostMask</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Test|x64'">../Shaders/PixelShaderMask.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Test|x64'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">PS_PostMask</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../Shaders/PixelShaderMask.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">PS_PostMask</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">../Shaders/PixelShaderMask.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">
|
||||
</ObjectFileOutput>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PS_PostMask</EntryPointName>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">PS_PostMask</EntryPointName>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">PS_PostMask</EntryPointName>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PS_PostMask</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.0</ShaderModel>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Test|x64'">PS_PostMask</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Test|x64'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Test|x64'">4.0</ShaderModel>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">PS_PostMask</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4.0</ShaderModel>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">PS_PostMask</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">4.0</ShaderModel>
|
||||
</FxCompile>
|
||||
<FxCompile Include="..\shaders\PixelShaderPlain.hlsl">
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">Pixel</ShaderType>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">PS_PostPlain</EntryPointName>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">4.0</ShaderModel>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">PS_PostPlain</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">../Shaders/PixelShaderPlain.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">
|
||||
</ObjectFileOutput>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4.0</ShaderModel>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4.0</ShaderModel>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">4.0</ShaderModel>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PS_PostPlain</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../Shaders/PixelShaderPlain.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">PS_PostPlain</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../Shaders/PixelShaderPlain.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">PS_PostPlain</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">../Shaders/PixelShaderPlain.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
|
||||
</ObjectFileOutput>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PS_PostPlain</EntryPointName>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">PS_PostPlain</EntryPointName>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">PS_PostPlain</EntryPointName>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PS_PostPlain</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.0</ShaderModel>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Test|x64'">PS_PostPlain</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Test|x64'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Test|x64'">4.0</ShaderModel>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">PS_PostPlain</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4.0</ShaderModel>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">PS_PostPlain</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">Pixel</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">4.0</ShaderModel>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PS_PostPlain</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../Shaders/PixelShaderPlain.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Test|x64'">PS_PostPlain</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Test|x64'">../Shaders/PixelShaderPlain.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Test|x64'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">PS_PostPlain</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../Shaders/PixelShaderPlain.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">PS_PostPlain</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">../Shaders/PixelShaderPlain.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">
|
||||
</ObjectFileOutput>
|
||||
</FxCompile>
|
||||
<FxCompile Include="..\shaders\VertexShader.hlsl">
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">Vertex</ShaderType>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">TextureVertexShader</EntryPointName>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">VertexShader</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">../Shaders/VertexShader.h</HeaderFileOutput>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">4.0</ShaderModel>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">
|
||||
</ObjectFileOutput>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Vertex</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4.0</ShaderModel>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Vertex</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4.0</ShaderModel>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">Vertex</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">4.0</ShaderModel>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">VertexShader</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../Shaders/VertexShader.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">VertexShader</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../Shaders/VertexShader.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">VertexShader</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">../Shaders/VertexShader.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">VertexShader</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../Shaders/VertexShader.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Test|x64'">VertexShader</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Test|x64'">../Shaders/VertexShader.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Test|x64'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">VertexShader</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../Shaders/VertexShader.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</ObjectFileOutput>
|
||||
<VariableName Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">VertexShader</VariableName>
|
||||
<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">../Shaders/VertexShader.h</HeaderFileOutput>
|
||||
<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">
|
||||
</ObjectFileOutput>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">TextureVertexShader</EntryPointName>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TextureVertexShader</EntryPointName>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">TextureVertexShader</EntryPointName>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TextureVertexShader</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Vertex</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.0</ShaderModel>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Test|x64'">TextureVertexShader</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Test|x64'">Vertex</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Test|x64'">4.0</ShaderModel>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TextureVertexShader</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Vertex</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4.0</ShaderModel>
|
||||
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">TextureVertexShader</EntryPointName>
|
||||
<ShaderType Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">Vertex</ShaderType>
|
||||
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">4.0</ShaderModel>
|
||||
</FxCompile>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
|
||||
@ -68,6 +68,9 @@
|
||||
<Filter Include="softfloat">
|
||||
<UniqueIdentifier>{b113952e-b596-4a9e-922f-8ccff5b915ed}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="win32\Shaders">
|
||||
<UniqueIdentifier>{34d75786-02bd-43a5-b45d-934eef34e96e}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\ahidsound_dsonly.cpp">
|
||||
@ -976,4 +979,21 @@
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\resources\resource.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<FxCompile Include="..\shaders\VertexShader.hlsl">
|
||||
<Filter>win32\Shaders</Filter>
|
||||
</FxCompile>
|
||||
<FxCompile Include="..\shaders\PixelShaderPlain.hlsl">
|
||||
<Filter>win32\Shaders</Filter>
|
||||
</FxCompile>
|
||||
<FxCompile Include="..\shaders\PixelShader.hlsl">
|
||||
<Filter>win32\Shaders</Filter>
|
||||
</FxCompile>
|
||||
<FxCompile Include="..\shaders\PixelShaderAlpha.hlsl">
|
||||
<Filter>win32\Shaders</Filter>
|
||||
</FxCompile>
|
||||
<FxCompile Include="..\shaders\PixelShaderMask.hlsl">
|
||||
<Filter>win32\Shaders</Filter>
|
||||
</FxCompile>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@ -4,6 +4,23 @@ JIT Direct current rules are less complex now. It automatically switches off onl
|
||||
- RTG VRAM is outside of reserved natmem space. Workaround: Move RTG in earlier position using Hardware info GUI panel.
|
||||
Note that in 64-bit version RTG VRAM must be inside of reserved natmem space. (Outside = error message and return back to GUI)
|
||||
|
||||
|
||||
Beta 10:
|
||||
|
||||
Direct3D11 support should now work in any Windows 7SP1+ installation without extra manual updates (that D3D9 required) and also work with most older GPUs.
|
||||
|
||||
- DIVS/DIVU overflow condition undefined flags emulated. 68000 was already correct (N is also always set). 68020/030 has weird extra conditions. 68040/060 never sets undefined flags.
|
||||
- Direct3D11 init failing due to missing DLLs caused a crash.
|
||||
- D3D11 mode now uses pre-compiled shaders, D3DCompiler_47.dll is not needed anymore, which is not system built-in in Windows 7 and 8.0.
|
||||
- D3D11 fullscreen now temporarily switches to desktop when opening GUI. Opening GUI on top of fullscreen is unreliable, causing random black screens, dropping to desktop with blank emulation window visible etc...
|
||||
- D3D11 16-bit mode is now working, only main texture should be 16-bit, everything else needs to be 32-bit (GPU does needed conversions internally).
|
||||
- Direct3D11 mode minimum supported hardware level is now 10.0 (was 11.0)
|
||||
- Gigatron Arriba boot ROM support added.
|
||||
- GUI OSD now ignores very quick floppy select/deselects (for example used to check diskchanges), floppy OSD only lights when drive is selected for more than 1 frames. Reduces number of useless OSD updates.
|
||||
- Added "CIA 391078-01" advanced chipset checkbox. This CIA revision has a bug, if IO port is in output mode, reading it will always read output mode data state. Other models, including original DIP 8520, 391078-02 and Akiko internal CIAs read IO pin external voltage level as documented. This can affect "bad" mouse left button/joystick fire button reading code if it uses output mode.
|
||||
- Joystick fire button/mouse left button CIA IO ports in output mode always used 391078-01 behavior.
|
||||
- 68020/030 instruction cache update, cache read hits were possible even if cache was disabled.
|
||||
|
||||
Beta 9:
|
||||
|
||||
- Added workaround that disables RTG HW sprite if enabled in D3D11 mode. (HW sprite is not yet supported in D3D11)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user