4000b14

diff --git a/fpp.cpp b/fpp.cpp
index 89d55d16ddd3852c0b301013f63ce58ec30995d6..545b1181af79c1a13bdc1326baff05fbebb02a72 100644 (file)
--- a/fpp.cpp
+++ b/fpp.cpp
@@ -3128,13 +3128,8 @@ static void fpuop_arithmetic2 (uae_u32 opcode, uae_u16 extra)
        fpu_noinst (opcode, pc);
 }
 
-static bool plop;
-
 void fpuop_arithmetic (uae_u32 opcode, uae_u16 extra)
 {
-       if (plop)
-               write_log(_T("%04x %04x %08x\n"), opcode, extra, M68K_GETPC);
-
        regs.fpu_state = 1;
        regs.fp_exception = false;
        fpu_mmu_fixup = false;

diff --git a/od-win32/direct3d11.cpp b/od-win32/direct3d11.cpp
index 7d8ef95c822fcc826103efee1bd2f7412b6d68b5..56119d10363947f6ac2fcce59fcb8697e2f06847 100644 (file)
--- a/od-win32/direct3d11.cpp
+++ b/od-win32/direct3d11.cpp
@@ -1690,18 +1690,27 @@ static void freeshaderdata(struct shaderdata11 *s)
        FreeShaderTex(&s->lpWorkTexture1);
        FreeShaderTex(&s->lpWorkTexture2);
        FreeShaderTex(&s->lpTempTexture);
-       if (s->lpHq2xLookupTexture)
+       if (s->lpHq2xLookupTexture) {
                s->lpHq2xLookupTexture->Release();
-       if (s->lpHq2xLookupTexturerv)
+               s->lpHq2xLookupTexture = NULL;
+       }
+       if (s->lpHq2xLookupTexturerv) {
                s->lpHq2xLookupTexturerv->Release();
+               s->lpHq2xLookupTexturerv = NULL;
+       }
        for (int j = 0; j < MAX_TECHNIQUE_LAYOUTS; j++) {
                if (s->layouts[j])
                        s->layouts[j]->Release();
+               s->layouts[j] = NULL;
        }
-       if (s->vertexBuffer)
+       if (s->vertexBuffer) {
                s->vertexBuffer->Release();
-       if (s->indexBuffer)
+               s->vertexBuffer = NULL;
+       }
+       if (s->indexBuffer) {
                s->indexBuffer->Release();
+               s->indexBuffer = NULL;
+       }
        memset(s, 0, sizeof(struct shaderdata11));
 }
 
@@ -3627,17 +3636,20 @@ static int xxD3D11_init2(HWND ahwnd, int monid, int w_w, int w_h, int t_w, int t
                return 0;
        }
 
-       ComPtr<IDXGIDevice1> dxgiDevice;
-       result = d3d->m_device->QueryInterface(__uuidof(IDXGIDevice1), &dxgiDevice);
-       if (FAILED(result)) {
-               write_log(_T("QueryInterface IDXGIDevice1 %08x\n"), result);
-       } else {
-               int f = apm->gfx_backbuffers <= 1 ? 1 : 2;
-               if (d3d->blackscreen)
-                       f++;
-               result = dxgiDevice->SetMaximumFrameLatency(f);
+       {
+               ComPtr<IDXGIDevice1> dxgiDevice;
+               result = d3d->m_device->QueryInterface(__uuidof(IDXGIDevice1), &dxgiDevice);
                if (FAILED(result)) {
-                       write_log(_T("IDXGIDevice1 SetMaximumFrameLatency %08x\n"), result);
+                       write_log(_T("QueryInterface IDXGIDevice1 %08x\n"), result);
+               }
+               else {
+                       int f = apm->gfx_backbuffers <= 1 ? 1 : 2;
+                       if (d3d->blackscreen)
+                               f++;
+                       result = dxgiDevice->SetMaximumFrameLatency(f);
+                       if (FAILED(result)) {
+                               write_log(_T("IDXGIDevice1 SetMaximumFrameLatency %08x\n"), result);
+                       }
                }
        }
 
@@ -3670,14 +3682,6 @@ static int xxD3D11_init2(HWND ahwnd, int monid, int w_w, int w_h, int t_w, int t
 
        ret = 1;
 
-       if (d3d11_feature_level < D3D10_FEATURE_LEVEL_10_0) {
-               if (!CreateTexture(d3d)) {
-                       write_log(_T("D3D11 texture creation test failed\n"));
-                       ret = 0;
-               }
-               FreeTextures(d3d);
-       }
-
        write_log(_T("D3D11 init end\n"));
        return ret;
 }

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 8b9d7fbe1e22e097cc29648db7623a7dc3a4a0a5..1223410565dd1613accaf9d8669135ceb5c508a7 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(2018, 6, 12)
+#define WINUAEDATE MAKEBD(2018, 6, 17)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 1fd91f36dbe8b4e25eaf0396b84791adca399387..d8d4db8f7b6c724147ceebd2198d0bd2d1e3eee8 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,14 @@
 \r
+\r
+Beta 14:\r
+\r
+- Virtual RDB (generated when partition hardfile is mounted in non-UAE controller) now also supports >512 block size partitions.\r
+- Some more code analyzer fixes.\r
+- Paula audio volume GUI volume setting was ignored if audio mode was mono.\r
+- Restrict minimum allowed JIT cache size to 128. (Previously too small unsupported size was allowed)\r
+- Fixed uaescsi.device reset memory corruption if CD filesystem uses TD_ADDCHANGEINT.\r
+- Logarithmic softfloat functions returned infinity when source value was nan.\r
+\r
 Beta 13:\r
 \r
 - Toccata sound was not fully closed when reset/reset and caused crash if new config was loaded and started.\r