3600b14

diff --git a/main.cpp b/main.cpp
index a543bf6fca0abe4b878a29ea202bf60bf0cdc3d5..c19740fce9121a9797e2073968ca6c42bab84726 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -170,7 +170,7 @@ void fixup_prefs_dimensions (struct uae_prefs *prefs)
                ap->gfx_vflip = 0;
                ap->gfx_strobo = false;
                // no llvs support yet
-               if (currprefs.gfx_api > 1)
+               if (prefs->gfx_api > 1)
                        ap->gfx_vsyncmode = 0;
                if (ap->gfx_vsync < 0) {
                        // adaptive sync

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 96d73e59131ac53694dd8ad53219b18e9de89bf3..1fdb2428fd92d66f7e9a3cac25f6707fafc8c2f0 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -20,12 +20,12 @@
 #define LANG_DLL_FULL_VERSION_MATCH 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("13")
+#define WINUAEBETA _T("14")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2017, 12, 16)
+#define WINUAEDATE MAKEBD(2017, 12, 20)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index d2e14720e3762e8baf0629df6aad91fc504ca9f6..b7bbeaa1a2d381f1c5d9c4b453c80c68739c9b86 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -4,6 +4,25 @@ 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.\r
   Note that in 64-bit version RTG VRAM must be inside of reserved natmem space. (Outside = error message and return back to GUI)\r
 \r
+\r
+Beta 14:\r
+\r
+- D3D11: lower hardware levels are supported again. (broke in previous beta)\r
+- D3D11: if Windows 7 and DXGI 1.1+ is not detected, show message that asks to install Platform Update (KB2670838). WinUAE requires DXGI 1.1. DXGI 1.0 won't be supported. (Confirmed on VM that Win7SP1 iso install + optional KB2670838 from Windows Update without installing any other updates is enough to use D3D11 mode)\r
+- D3D9 low latency vsync was reverted to normal vsync if default.uae was missing or default.uae enabled D3D11 mode.\r
+- D3D11 custom fx shader support implemented.\r
+- D3D11 supports most existing D3D9 fx shaders by in-memory string renaming: technique -> technique10 and ps_2_0/ps_3_0 -> ps_4_0_level_9_3 and vs_2_0/vs_3_0 -> vs_4_0_level_9_3. For some reason D3D11 effect compiler ignores D3D9 technique format but nearly everything else is supported. D3DCompiler_46.dll or D3DCompiler_47.dll required.\r
+- D3D9 and D3D11: if shader fx file does not have combineTechique but has at least one technique: automatically select first technique as combineTechique.\r
+- D3D11 mode GUI D3D shader list is only shown if D3DCompiler_46.dll or D3DCompiler_47.dll is available.\r
+- D3D11 in 16-bit mode but 16-bit not supported: switch to 32-bit instead of falling back to Direct3D 9.\r
+- DirectDraw + UAERTG caused crash (earlier betas)\r
+- Use 391078-01 CIA in A600 Quickstart. It seems most (all?) A600s have -01 revision, A1200/A4000 can have -01 or -02.\r
+- If Direct3D 11 is selected as default, also select 32-bit as default depth.\r
+\r
+D3D11 custom shader note: texture shaders (tx_1_0) are not implemented. D3D11 replacements for D3DXFillTextureTX()/D3DXFillCubeTextureTX()/D3DXFillVolumeTextureTX() D3D9X functions don't seem to exist. (But fx compiler supports "tx_1_0" shader target so perhaps they are hiding somewhere..)\r
+\r
+Beta 13:\r
+\r
 - Memory cycle exact CPU speed slider scale fixed. (0 is max)\r
 - D3D11: monitor bezel overlays supported.\r
 - D3D11: RGB mask wrong colors fixed. (RGB<>BGR)\r