2610b4

diff --git a/cfgfile.cpp b/cfgfile.cpp
index 093f54d9edeff18473dd24b0ac0e9049662908ee..e86385f34e3b8dae2a524689ffa0ef2bf9f460b0 100644 (file)
--- a/cfgfile.cpp
+++ b/cfgfile.cpp
@@ -919,15 +919,12 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type)
                if (p->gfx_filtermask[i + MAX_FILTERSHADERS][0])
                        cfgfile_write_str (f, _T("gfx_filtermask_post"), p->gfx_filtermask[i + MAX_FILTERSHADERS]);
        }
-       cfgfile_dwrite_str (f, _T("gfx_filter_mask"), p->gfx_filtermask[2 * MAX_FILTERSHADERS - 1]);
+       cfgfile_dwrite_str (f, _T("gfx_filter_mask"), p->gfx_filtermask[2 * MAX_FILTERSHADERS]);
        {
                bool d3dfound = false;
-               for (int i = 0; i < 2 * MAX_FILTERSHADERS; i++) {
-                       if (p->gfx_filtershader[i][0] && p->gfx_api) {
-                               cfgfile_dwrite (f, _T("gfx_filter"), _T("D3D:%s"), p->gfx_filtershader[i]);
-                               d3dfound = true;
-                               break;
-                       }
+               if (p->gfx_filtershader[2 * MAX_FILTERSHADERS][0] && p->gfx_api) {
+                       cfgfile_dwrite (f, _T("gfx_filter"), _T("D3D:%s"), p->gfx_filtershader[2 * MAX_FILTERSHADERS]);
+                       d3dfound = true;
                }
                if (!d3dfound) {
                        if (p->gfx_filter > 0) {
@@ -1639,7 +1636,7 @@ static int cfgfile_parse_host (struct uae_prefs *p, TCHAR *option, TCHAR *value)
                || cfgfile_intval (option, value, _T("gfx_gamma"), &p->gfx_gamma, 1)
                || cfgfile_intval (option, value, _T("gfx_filter_keep_autoscale_aspect"), &p->gfx_filter_keep_autoscale_aspect, 1)
                || cfgfile_intval (option, value, _T("gfx_horizontal_tweak"), &p->gfx_extrawidth, 1)
-               || cfgfile_string (option, value, _T("gfx_filter_mask"), p->gfx_filtermask[2 * MAX_FILTERSHADERS - 1], sizeof p->gfx_filtermask[2 * MAX_FILTERSHADERS - 1] / sizeof (TCHAR))
+               || cfgfile_string (option, value, _T("gfx_filter_mask"), p->gfx_filtermask[2 * MAX_FILTERSHADERS], sizeof p->gfx_filtermask[2 * MAX_FILTERSHADERS] / sizeof (TCHAR))
                || cfgfile_intval (option, value, _T("filesys_max_size"), &p->filesys_limit, 1)
 
                || cfgfile_floatval (option, value, _T("rtg_vert_zoom_multf"), &p->rtg_vert_zoom_mult)
@@ -1988,14 +1985,14 @@ static int cfgfile_parse_host (struct uae_prefs *p, TCHAR *option, TCHAR *value)
                if (s) {
                        *s++ = 0;
                        if (!_tcscmp (value, _T("D3D"))) {
-                               int i;
                                p->gfx_api = 1;
-                               for (i = 0; i < 2 * MAX_FILTERSHADERS; i++) {
-                                       if (p->gfx_filtershader[i][0])
-                                               break;
+                               _tcscpy (p->gfx_filtershader[2 * MAX_FILTERSHADERS], s);
+                               for (int i = 0; i < 2 * MAX_FILTERSHADERS; i++) {
+                                       if (!_tcsicmp (p->gfx_filtershader[i], s)) {
+                                               p->gfx_filtershader[i][0] = 0;
+                                               p->gfx_filtermask[i][0] = 0;
+                                       }
                                }
-                               if (i >= 2 * MAX_FILTERSHADERS)
-                                       _tcscpy (p->gfx_filtershader[0], s);
                        }
                }
                if (!_tcscmp (value, _T("direct3d"))) {
@@ -4685,7 +4682,7 @@ void default_prefs (struct uae_prefs *p, int type)
        p->cs_resetwarning = 1;
 
        p->gfx_filter = 0;
-       for (int i = 0; i < 2 * MAX_FILTERSHADERS; i++) {
+       for (int i = 0; i <= 2 * MAX_FILTERSHADERS; i++) {
                p->gfx_filtershader[i][0] = 0;
                p->gfx_filtermask[i][0] = 0;
        }

diff --git a/drawing.cpp b/drawing.cpp
index f0d9bdc0b1e0d94f7df376ec2ada01a5053c7935..e10a6187dd93935a1f367023f95818487a4e7cf8 100644 (file)
--- a/drawing.cpp
+++ b/drawing.cpp
@@ -2964,7 +2964,7 @@ void hardware_line_completed (int lineno)
 #endif
 }
 
-void check_picasso (void)
+static void check_picasso (void)
 {
 #ifdef PICASSO96
        if (picasso_on && picasso_redraw_necessary)
@@ -3000,8 +3000,6 @@ void redraw_frame (void)
 
 bool vsync_handle_check (void)
 {
-       check_picasso ();
-
        int changed = check_prefs_changed_gfx ();
        if (changed > 0) {
                reset_drawing ();
@@ -3020,6 +3018,7 @@ bool vsync_handle_check (void)
        check_prefs_changed_cd ();
        check_prefs_changed_custom ();
        check_prefs_changed_cpu ();
+       check_picasso ();
        return changed != 0;
 }
 

diff --git a/include/options.h b/include/options.h
index 0638818ccf77910e4d0d05fade5954d0654ab004..09b6de10f53353362902fd3b4c2f51f9a145f818 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -322,8 +322,8 @@ struct uae_prefs {
        bool lightboost_strobo;
 
        int gfx_filter;
-       TCHAR gfx_filtershader[2 * MAX_FILTERSHADERS][MAX_DPATH];
-       TCHAR gfx_filtermask[2 * MAX_FILTERSHADERS][MAX_DPATH];
+       TCHAR gfx_filtershader[2 * MAX_FILTERSHADERS + 1][MAX_DPATH];
+       TCHAR gfx_filtermask[2 * MAX_FILTERSHADERS + 1][MAX_DPATH];
        TCHAR gfx_filteroverlay[MAX_DPATH];
        struct wh gfx_filteroverlay_pos;
        int gfx_filteroverlay_overscan;

diff --git a/od-win32/direct3d.cpp b/od-win32/direct3d.cpp
index 47a0710e5215d3ceb0cee1c610e0ade5ceaa8569..2076727540d114ef51bcd8552802deced358a73d 100644 (file)
--- a/od-win32/direct3d.cpp
+++ b/od-win32/direct3d.cpp
@@ -49,6 +49,7 @@ static bool showoverlay = true;
 
 #define SHADERTYPE_BEFORE 1
 #define SHADERTYPE_AFTER 2
+#define SHADERTYPE_MIDDLE 3
 #define SHADERTYPE_MASK_BEFORE 3
 #define SHADERTYPE_MASK_AFTER 4
 #define SHADERTYPE_POST 10
@@ -57,6 +58,8 @@ struct shaderdata
 {
        int type;
        int psPreProcess;
+       int worktex_width;
+       int worktex_height;
        LPDIRECT3DTEXTURE9 lpWorkTexture1;
        LPDIRECT3DTEXTURE9 lpWorkTexture2;
        LPDIRECT3DTEXTURE9 lpTempTexture;
@@ -79,13 +82,14 @@ struct shaderdata
        D3DXHANDLE m_SourceTextureEffectHandle;
        D3DXHANDLE m_WorkingTexture1EffectHandle;
        D3DXHANDLE m_WorkingTexture2EffectHandle;
+       D3DXHANDLE m_Hq2xLookupTextureHandle;
        // Masks
        LPDIRECT3DTEXTURE9 masktexture;
        int masktexture_w, masktexture_h;
 };
 static LPDIRECT3DTEXTURE9 lpPostTempTexture;
 
-#define MAX_SHADERS 10
+#define MAX_SHADERS (2 * MAX_FILTERSHADERS + 2)
 #define SHADER_POST 0
 static struct shaderdata shaders[MAX_SHADERS];
 
@@ -127,13 +131,13 @@ static D3DXMATRIXA16 m_matPreProj;
 static D3DXMATRIXA16 m_matPreView;
 static D3DXMATRIXA16 m_matPreWorld;
 static D3DXMATRIXA16 postproj;
-static D3DXVECTOR4 maskmult, maskshift, texelsize;
+static D3DXVECTOR4 maskmult, maskshift;
 static D3DXVECTOR4 fakesize;
 
 static int ledwidth, ledheight;
 static int max_texture_w, max_texture_h;
 static int tin_w, tin_h, tout_w, tout_h, window_h, window_w;
-static int t_depth, mult, multx;
+static int t_depth, dmult, dmultx;
 static int required_sl_texture_w, required_sl_texture_h;
 static int vsync2, guimode, maxscanline;
 static int resetcount;
@@ -297,7 +301,6 @@ static D3DXHANDLE postTexelSize;
 
 static float m_scale;
 static LPCSTR m_strName;
-static D3DXHANDLE m_Hq2xLookupTextureHandle;
 
 enum psEffect_Pass { psEffect_None, psEffect_PreProcess1, psEffect_PreProcess2, psEffect_Combine };
 
@@ -382,7 +385,7 @@ static int psEffect_ParseParameters (LPD3DXEFFECTCOMPILER EffectCompiler, LPD3DX
                                if(strcmpi(ParamDesc.Semantic, "WORKINGTEXTURE1") == 0)
                                        s->m_WorkingTexture2EffectHandle = hParam;
                                if(strcmpi(ParamDesc.Semantic, "HQ2XLOOKUPTEXTURE") == 0)
-                                       m_Hq2xLookupTextureHandle = hParam;
+                                       s->m_Hq2xLookupTextureHandle = hParam;
                        } else if(ParamDesc.Class == D3DXPC_OBJECT && ParamDesc.Type == D3DXPT_STRING) {
                                LPCSTR pstrTechnique = NULL;
                                if(strcmpi(ParamDesc.Semantic, "COMBINETECHNIQUE") == 0) {
@@ -987,8 +990,8 @@ static int psEffect_SetTextures (LPDIRECT3DTEXTURE9 lpSource, struct shaderdata
                        return 0;
                }
        }
-       if (m_Hq2xLookupTextureHandle) {
-               hr = s->pEffect->SetTexture (m_Hq2xLookupTextureHandle, s->lpHq2xLookupTexture);
+       if (s->m_Hq2xLookupTextureHandle) {
+               hr = s->pEffect->SetTexture (s->m_Hq2xLookupTextureHandle, s->lpHq2xLookupTexture);
                if (FAILED (hr)) {
                        write_log (_T("%s: SetTextures:lpHq2xLookupTexture %s\n"), D3DHEAD, D3D_ErrorString (hr));
                        return 0;
@@ -1123,19 +1126,18 @@ static LPDIRECT3DTEXTURE9 createtext (int w, int h, D3DFORMAT format)
        return t;
 }
 
-static int worktex_width, worktex_height;
-
 static int allocextratextures (struct shaderdata *s, int w, int h)
 {
        HRESULT hr;
        if (FAILED (hr = d3ddev->CreateTexture (w, h, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &s->lpWorkTexture1, NULL))) {
-               write_log (_T("%s: Failed to create temp texture: %s\n"), D3DHEAD, D3D_ErrorString (hr));
+               write_log (_T("%s: Failed to create working texture1: %s:%d\n"), D3DHEAD, D3D_ErrorString (hr), s - &shaders[0]);
                return 0;
        }
        if (FAILED (hr = d3ddev->CreateTexture (w, h, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &s->lpWorkTexture2, NULL))) {
-               write_log (_T("%s: Failed to create working texture2: %s\n"), D3DHEAD, D3D_ErrorString (hr));
+               write_log (_T("%s: Failed to create working texture2: %s:%d\n"), D3DHEAD, D3D_ErrorString (hr), s - &shaders[0]);
                return 0;
        }
+       write_log (_T("%s: %d*%d working texture:%d\n"), D3DHEAD, w, h, s - &shaders[0]);
        return 1;
 }
 
@@ -1146,26 +1148,34 @@ static int createamigatexture (int w, int h)
        texture = createtext (w, h, tformat);
        if (!texture)
                return 0;
-       write_log (_T("%s: %d*%d texture allocated, bits per pixel %d\n"), D3DHEAD, w, h, t_depth);
+       write_log (_T("%s: %d*%d main texture, depth %d\n"), D3DHEAD, w, h, t_depth);
        if (psActive) {
                for (int i = 0; i < MAX_SHADERS; i++) {
                        int w2, h2;
-                       if (shaders[i].type == SHADERTYPE_BEFORE) {
-                               w2 = worktex_width;
-                               h2 = worktex_height;
+                       int type = shaders[i].type;
+                       if (type == SHADERTYPE_BEFORE) {
+                               w2 = shaders[i].worktex_width;
+                               h2 = shaders[i].worktex_height;
                                if (!allocextratextures (&shaders[i], w, h))
                                        return 0;
+                       } else if (type == SHADERTYPE_MIDDLE) {
+                               w2 = shaders[i].worktex_width;
+                               h2 = shaders[i].worktex_height;
                        } else {
                                w2 = window_w;
                                h2 = window_h;
                        }
-                       if (shaders[i].type == SHADERTYPE_BEFORE || shaders[i].type == SHADERTYPE_AFTER) {
+                       if (type == SHADERTYPE_BEFORE || type == SHADERTYPE_AFTER || type == SHADERTYPE_MIDDLE) {
                                D3DLOCKED_BOX lockedBox;
+                               if (FAILED (hr = d3ddev->CreateVolumeTexture (256, 16, 256, 1, D3DUSAGE_DYNAMIC, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &shaders[i].lpHq2xLookupTexture, NULL))) {
+                                       write_log (_T("%s: Failed to create volume texture: %s:%d\n"), D3DHEAD, D3D_ErrorString (hr), i);
+                                       return 0;
+                               }
                                if (FAILED (hr = shaders[i].lpHq2xLookupTexture->LockBox (0, &lockedBox, NULL, 0))) {
-                                       write_log (_T("%s: Failed to lock box of volume texture: %s\n"), D3DHEAD, D3D_ErrorString (hr));
+                                       write_log (_T("%s: Failed to lock box of volume texture: %s:%d\n"), D3DHEAD, D3D_ErrorString (hr), i);
                                        return 0;
                                }
-                               write_log (_T("HQ2X texture (%dx%d) (%dx%d)\n"), w2, h2, w, h);
+                               write_log (_T("HQ2X texture (%dx%d) (%dx%d):%d\n"), w2, h2, w, h, i);
                                BuildHq2xLookupTexture (w2, h2, w, h,  (unsigned char*)lockedBox.pBits);
                                shaders[i].lpHq2xLookupTexture->UnlockBox (0);
                        }
@@ -1179,50 +1189,53 @@ static int createtexture (int ow, int oh, int win_w, int win_h)
        HRESULT hr;
        bool haveafter = false;
 
-       int w, h;
-#if 0
-       if (ow > win_w * multx && oh > win_h * multx) {
-               w = ow;
-               h = oh;
+       int zw, zh;
+
+       if (ow > win_w * dmultx && oh > win_h * dmultx) {
+               zw = ow;
+               zh = oh;
        } else {
-               w = win_w * multx;
-               h = win_h * multx;
+               zw = win_w * dmultx;
+               zh = win_h * dmultx;
        }
-#else
-       w = ow;
-       h = oh;
-#endif
-       worktex_width = w;
-       worktex_height = h;
        for (int i = 0; i < MAX_SHADERS; i++) {
-               if (shaders[i].type == SHADERTYPE_BEFORE || shaders[i].type == SHADERTYPE_AFTER) {
-                       if (FAILED (hr = d3ddev->CreateTexture (w, h, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &shaders[i].lpTempTexture, NULL))) {
-                               write_log (_T("%s: Failed to create working texture1: %s\n"), D3DHEAD, D3D_ErrorString (hr));
-                               return 0;
-                       }
+               if (shaders[i].type == SHADERTYPE_BEFORE || shaders[i].type == SHADERTYPE_AFTER || shaders[i].type == SHADERTYPE_MIDDLE) {
+                       int w2, h2, w, h;
                        if (shaders[i].type == SHADERTYPE_AFTER) {
+                               w2 = zw; h2 = zh;
+                               w = zw; h = zh;
                                haveafter = true;
                                if (!allocextratextures (&shaders[i], window_w, window_h))
                                        return 0;
-                       }
-                       if (psActive) {
-                               if (FAILED (hr = d3ddev->CreateVolumeTexture (256, 16, 256, 1, D3DUSAGE_DYNAMIC, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &shaders[i].lpHq2xLookupTexture, NULL))) {
-                                       write_log (_T("%s: Failed to create volume texture: %s\n"), D3DHEAD, D3D_ErrorString (hr));
+                       } else if (shaders[i].type == SHADERTYPE_MIDDLE) {
+                               // worktex_width = 800
+                               // extratex = amiga res
+                               w2 = zw; h2 = zh;
+                               w = zw; h = zh;
+                               if (!allocextratextures (&shaders[i], ow, oh))
                                        return 0;
-                               }
+                       } else {
+                               w2 = zw;
+                               h2 = zh;
+                               w = ow;
+                               h = oh;
+                       }
+                       if (FAILED (hr = d3ddev->CreateTexture (w2, h2, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &shaders[i].lpTempTexture, NULL))) {
+                               write_log (_T("%s: Failed to create working texture1: %s:%d\n"), D3DHEAD, D3D_ErrorString (hr), i);
+                               return 0;
                        }
+                       write_log (_T("%s: %d*%d temp texture:%d\n"), D3DHEAD, w2, h2, i);
+                       shaders[i].worktex_width = w;
+                       shaders[i].worktex_height = h;
                }
        }
-
-
        if (haveafter) {
                if (FAILED (hr = d3ddev->CreateTexture (window_w, window_h, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &lpPostTempTexture, NULL))) {
-                       write_log (_T("%s: Failed to create working texture1: %s\n"), D3DHEAD, D3D_ErrorString (hr));
+                       write_log (_T("%s: Failed to create temp texture: %s\n"), D3DHEAD, D3D_ErrorString (hr));
                        return 0;
                }
+               write_log (_T("%s: %d*%d after texture\n"), D3DHEAD, window_w, window_h);
        }
-       write_log (_T("%s: working texture allocated pre %d*%d, post %d*%d, bits per pixel %d\n"), D3DHEAD, w, h, window_w, window_h, t_depth);
-       texelsize.x = 1.0f / w; texelsize.y = 1.0f / h; texelsize.z = 1; texelsize.w = 1; 
        return 1;
 }
 
@@ -1551,6 +1564,7 @@ static int createmasktexture (const TCHAR *filename, struct shaderdata *sd)
        D3DXIMAGE_INFO dinfo;
        TCHAR tmp[MAX_DPATH];
        int maskwidth, maskheight;
+       int idx = sd - &shaders[0];
 
        if (filename[0] == 0)
                return 0;
@@ -1561,7 +1575,7 @@ static int createmasktexture (const TCHAR *filename, struct shaderdata *sd)
        if (!zf) {
                zf = zfile_fopen (filename, _T("rb"), ZFD_NORMAL);
                if (!zf) {
-                       write_log (_T("%s: couldn't open mask '%s'\n"), D3DHEAD, filename);
+                       write_log (_T("%s: couldn't open mask '%s':%d\n"), D3DHEAD, filename, idx);
                        return 0;
                }
        }
@@ -1574,12 +1588,12 @@ static int createmasktexture (const TCHAR *filename, struct shaderdata *sd)
                 D3DPOOL_DEFAULT, D3DX_FILTER_NONE, D3DX_FILTER_NONE, 0, &dinfo, NULL, &tx);
        xfree (buf);
        if (FAILED (hr)) {
-               write_log (_T("%s: temp mask texture load failed: %s\n"), D3DHEAD, D3D_ErrorString (hr));
+               write_log (_T("%s: temp mask texture load failed: %s:%d\n"), D3DHEAD, D3D_ErrorString (hr), idx);
                goto end;
        }
        hr = tx->GetLevelDesc (0, &txdesc);
        if (FAILED (hr)) {
-               write_log (_T("%s: mask image texture GetLevelDesc() failed: %s\n"), D3DHEAD, D3D_ErrorString (hr));
+               write_log (_T("%s: mask image texture GetLevelDesc() failed: %s:%d\n"), D3DHEAD, D3D_ErrorString (hr), idx);
                goto end;
        }
        sd->masktexture_w = dinfo.Width;
@@ -1605,12 +1619,12 @@ static int createmasktexture (const TCHAR *filename, struct shaderdata *sd)
        if (tx) {
                sd->masktexture = createtext (maskwidth, maskheight, D3DFMT_X8R8G8B8);
                if (FAILED (hr)) {
-                       write_log (_T("%s: mask texture creation failed: %s\n"), D3DHEAD, D3D_ErrorString (hr));
+                       write_log (_T("%s: mask texture creation failed: %s:%d\n"), D3DHEAD, D3D_ErrorString (hr), idx);
                        goto end;
                }
                hr = sd->masktexture->GetLevelDesc (0, &maskdesc);
                if (FAILED (hr)) {
-                       write_log (_T("%s: mask texture GetLevelDesc() failed: %s\n"), D3DHEAD, D3D_ErrorString (hr));
+                       write_log (_T("%s: mask texture GetLevelDesc() failed: %s:%d\n"), D3DHEAD, D3D_ErrorString (hr), idx);
                        goto end;
                }
                if (SUCCEEDED (hr = sd->masktexture->LockRect (0, &lock, NULL, 0))) {
@@ -1644,7 +1658,7 @@ static int createmasktexture (const TCHAR *filename, struct shaderdata *sd)
                sd->masktexture_w = maskdesc.Width;
                sd->masktexture_h = maskdesc.Height;
        }
-       write_log (_T("%s: mask %d*%d (%d*%d) %d*%d ('%s') texture allocated\n"), D3DHEAD, sd->masktexture_w, sd->masktexture_h, txdesc.Width, txdesc.Height, maskdesc.Width, maskdesc.Height, filename);
+       write_log (_T("%s: mask %d*%d (%d*%d) %d*%d ('%s':%d) texture allocated\n"), D3DHEAD, sd->masktexture_w, sd->masktexture_h, txdesc.Width, txdesc.Height, maskdesc.Width, maskdesc.Height, filename, idx);
        maskmult_x = (float)window_w / sd->masktexture_w;
        maskmult_y = (float)window_h / sd->masktexture_h;
 
@@ -1690,7 +1704,7 @@ static void setupscenecoords (void)
 
        //write_log (_T("%dx%d %dx%d %dx%d\n"), tin_w, tin_h, tin_w, tin_h, window_w, window_h);
 
-       getfilterrect2 (&dr, &sr, &zr, window_w, window_h, tin_w / mult, tin_h / mult, mult, tin_w, tin_h);
+       getfilterrect2 (&dr, &sr, &zr, window_w, window_h, tin_w / dmult, tin_h / dmult, dmult, tin_w, tin_h);
 
        if (memcmp (&sr, &sr2, sizeof RECT) || memcmp (&dr, &dr2, sizeof RECT) || memcmp (&zr, &zr2, sizeof RECT)) {
                write_log (_T("POS (%d %d %d %d) - (%d %d %d %d)[%d,%d] (%d %d)\n"),
@@ -1794,7 +1808,7 @@ uae_u8 *getfilterbuffer3d (struct vidbuffer *vb, int *widthp, int *heightp, int
        int w, h;
 
        *depth = t_depth;
-       getfilterrect2 (&dr, &sr, &zr, window_w, window_h, tin_w / mult, tin_h / mult, mult, tin_w, tin_h);
+       getfilterrect2 (&dr, &sr, &zr, window_w, window_h, tin_w / dmult, tin_h / dmult, dmult, tin_w, tin_h);
        w = sr.right - sr.left;
        h = sr.bottom - sr.top;
        p = vb->bufmem;
@@ -1858,6 +1872,9 @@ static void settransform (struct shaderdata *s)
        // Identity for world
        D3DXMatrixIdentity (&m_matPreWorld);
 
+       if (s)
+               psEffect_SetMatrices (&m_matProj, &m_matView, &m_matWorld, s);
+
        MatrixOrthoOffCenterLH (&m_matProj2, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f);
 
        MatrixTranslation (&m_matView2, 0.5f - 0.5f / tout_w, 0.5f + 0.5f / tout_h, 0.0f);
@@ -2019,6 +2036,16 @@ static int restoredeviceobjects (void)
                                createmasktexture (currprefs.gfx_filtermask[i], s);
                        }
                }
+               if (currprefs.gfx_filtershader[2 * MAX_FILTERSHADERS][0]) {
+                       struct shaderdata *s = allocshaderslot (SHADERTYPE_MIDDLE);
+                       if (!psEffect_LoadEffect (currprefs.gfx_filtershader[2 * MAX_FILTERSHADERS], true, s, 2 * MAX_FILTERSHADERS)) {
+                               currprefs.gfx_filtershader[2 * MAX_FILTERSHADERS][0] = changed_prefs.gfx_filtershader[2 * MAX_FILTERSHADERS][0] = 0;
+                       }
+               }
+               if (currprefs.gfx_filtermask[2 * MAX_FILTERSHADERS][0]) {
+                       struct shaderdata *s = allocshaderslot (SHADERTYPE_MASK_AFTER);
+                       createmasktexture (currprefs.gfx_filtermask[2 * MAX_FILTERSHADERS], s);
+               }
                for (int i = 0; i < MAX_FILTERSHADERS; i++) {
                        if (currprefs.gfx_filtershader[i + MAX_FILTERSHADERS][0]) {
                                struct shaderdata *s = allocshaderslot (SHADERTYPE_AFTER);
@@ -2412,8 +2439,8 @@ const TCHAR *D3D_init (HWND ahwnd, int w_w, int w_h, int depth, int mmult)
        if (!shaderon)
                write_log (_T("Using non-shader version\n"));
 
-       multx = mmult;
-       mult = S2X_getmult ();
+       dmultx = mmult;
+       dmult = S2X_getmult ();
 
        window_w = w_w;
        window_h = w_h;
@@ -2423,8 +2450,8 @@ const TCHAR *D3D_init (HWND ahwnd, int w_w, int w_h, int depth, int mmult)
                        D3DHEAD, w_w, w_h, max_texture_w, max_texture_h);
                return errmsg;
        }
-       while (multx > 1 && (w_w * multx > max_texture_w || w_h * multx > max_texture_h))
-               multx--;
+       while (dmultx > 1 && (w_w * dmultx > max_texture_w || w_h * dmultx > max_texture_h))
+               dmultx--;
 
        required_sl_texture_w = w_w;
        required_sl_texture_h = w_h;
@@ -2495,11 +2522,11 @@ static bool alloctextures (void)
 
 bool D3D_alloctexture (int w, int h)
 {
-       tin_w = w * mult;
-       tin_h = h * mult;
+       tin_w = w * dmult;
+       tin_h = h * dmult;
 
-       tout_w = tin_w * multx;
-       tout_h = tin_h * multx;
+       tout_w = tin_w * dmultx;
+       tout_h = tin_h * dmultx;
 
        changed_prefs.leds_on_screen = currprefs.leds_on_screen = currprefs.leds_on_screen | STATUSLINE_TARGET;
 
@@ -2749,8 +2776,8 @@ static void D3D_render2 (void)
        if (shaderon > 0 && shaders[SHADER_POST].pEffect) {
                for (int i = 0; i < MAX_SHADERS; i++) {
                        struct shaderdata *s = &shaders[i];
-                       if (s->type == SHADERTYPE_BEFORE) {
-                               settransform2 (s);
+                       if (s->type == SHADERTYPE_BEFORE || s->type == SHADERTYPE_MIDDLE) {
+                               settransform (s);
                                srctex = processshader (srctex, s, true);
                                if (!srctex)
                                        return;
@@ -2766,6 +2793,8 @@ static void D3D_render2 (void)
                LPD3DXEFFECT postEffect = s->pEffect;
                int after = -1;
                LPDIRECT3DTEXTURE9 masktexture = NULL;
+               D3DSURFACE_DESC Desc;
+               D3DXVECTOR4 texelsize;
 
                for (int i = 0; i < MAX_SHADERS; i++) {
                        struct shaderdata *s = &shaders[i];
@@ -2783,6 +2812,12 @@ static void D3D_render2 (void)
                hr = postEffect->SetMatrix (postMatrixSource, &postproj);
                hr = postEffect->SetVector (postMaskMult, &maskmult);
                hr = postEffect->SetVector (postMaskShift, &maskshift);
+
+               srctex->GetLevelDesc (0, &Desc);
+               texelsize.x = 1.0f / Desc.Width;
+               texelsize.y = 1.0f / Desc.Height;
+               texelsize.z = 1; texelsize.w = 1;
+
                hr = postEffect->SetVector (postTexelSize, &texelsize);
 
                if (masktexture) {

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index 7ec5ae8a8b2d53ac40ef50f814a36327b462a5c5..1a15b3b5fc396676c1c13aa4dafd62af7974ac17 100644 (file)
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -3243,6 +3243,8 @@ int target_parse_option (struct uae_prefs *p, const TCHAR *option, const TCHAR *
                || cfgfile_intval (option, value, _T("guikey"), &p->win32_guikey, 1)
                || cfgfile_intval (option, value, _T("kbledmode"), &p->win32_kbledmode, 1)
                || cfgfile_yesno (option, value, _T("filesystem_mangle_reserved_names"), &p->win32_filesystem_mangle_reserved_names)
+               || cfgfile_intval (option, value, _T("extraframewait"), &extraframewait, 1)
+               || cfgfile_intval (option, value, _T("framelatency"), &forcedframelatency, 1)
                || cfgfile_intval (option, value, _T("cpu_idle"), &p->cpu_idle, 1));
 
        if (cfgfile_yesno (option, value, _T("rtg_match_depth"), &p->win32_rtgmatchdepth))
@@ -3431,15 +3433,6 @@ int target_parse_option (struct uae_prefs *p, const TCHAR *option, const TCHAR *
                return 1;
        }
 
-       if (cfgfile_intval (option, value, _T("extraframewait"), &v, 1)) {
-               extraframewait = fetchpri (v, 1);
-               return 1;
-       }
-       if (cfgfile_intval (option, value, _T("framelatency"), &v, 1)) {
-               forcedframelatency = fetchpri (v, 1);
-               return 1;
-       }
-
        i = 0;
        while (obsolete[i]) {
                if (!strcasecmp (obsolete[i], option)) {

diff --git a/od-win32/win32.h b/od-win32/win32.h
index a5b945560ccc4d374b3a64de680eac6f595a86f7..52e4897a4c72e91f572704fc46a9970adcf42f3c 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -19,11 +19,11 @@
 #define LANG_DLL 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("3")
+#define WINUAEBETA _T("4")
 #else
 #define WINUAEBETA _T("")
 #endif
-#define WINUAEDATE MAKEBD(2013, 6, 15)
+#define WINUAEDATE MAKEBD(2013, 6, 17)
 #define WINUAEEXTRA _T("")
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp
index 790127f7284ea7a28dbe156bc544d6f371de0442..abc5b4a17667c199ccdd74a76da3eb45a5c67c8a 100644 (file)
--- a/od-win32/win32gfx.cpp
+++ b/od-win32/win32gfx.cpp
@@ -1743,7 +1743,7 @@ int check_prefs_changed_gfx (void)
        c |= currprefs.gfx_api != changed_prefs.gfx_api ? (1|8|32) : 0;
        c |= currprefs.lightboost_strobo != changed_prefs.lightboost_strobo ? (2|16) : 0;
 
-       for (int i = 0; i < 2 * MAX_FILTERSHADERS; i++) {
+       for (int i = 0; i <= 2 * MAX_FILTERSHADERS; i++) {
                c |= _tcscmp (currprefs.gfx_filtershader[i], changed_prefs.gfx_filtershader[i]) ? (2|8) : 0;
                c |= _tcscmp (currprefs.gfx_filtermask[i], changed_prefs.gfx_filtermask[i]) ? (2|8) : 0;
        }
@@ -1833,7 +1833,7 @@ int check_prefs_changed_gfx (void)
                        display_change_requested = 0;
                }
 
-               for (int i = 0; i < 2 * MAX_FILTERSHADERS; i++) {
+               for (int i = 0; i <= 2 * MAX_FILTERSHADERS; i++) {
                        _tcscpy (currprefs.gfx_filtershader[i], changed_prefs.gfx_filtershader[i]);
                        _tcscpy (currprefs.gfx_filtermask[i], changed_prefs.gfx_filtermask[i]);
                }
@@ -1902,14 +1902,14 @@ int check_prefs_changed_gfx (void)
                }
                if (c & 256) {
                        init_colors ();
-                       drawing_init ();
+                       reset_drawing ();
                }
                if (c & 128) {
                        if (currprefs.gfx_autoresolution) {
                                c |= 2 | 8;
                        } else {
                                c |= 16;
-                               drawing_init ();
+                               reset_drawing ();
                                S2X_reset ();
                        }
                }

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 0f324056551ad620ebbcf0e26d91c5a6d29751d0..58d966ebce06b3cb5b8f89b138be761fed4b81a5 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -137,7 +137,7 @@ extern int mouseactive;
 TCHAR config_filename[256] = _T("");
 static TCHAR stored_path[MAX_DPATH];
 static int gui_size_changed;
-static int filterstackpos = 0;
+static int filterstackpos = 2 * MAX_FILTERSHADERS;
 
 static const int defaultaspectratios[] = {
                4, 3, 16, 10, 15, 9, 27, 16, 128, 75, 16, 9, 256, 135, 21, 9, 16, 3,
@@ -5706,7 +5706,7 @@ static INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM
                break;
        case WM_LBUTTONDOWN:
        case WM_MOUSEMOVE:
-               url_handler( hDlg, msg, wParam, lParam );
+               url_handler (hDlg, msg, wParam, lParam);
                break;
        }
 
@@ -5715,7 +5715,7 @@ static INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM
 
 static void enable_for_displaydlg (HWND hDlg)
 {
-       int rtg = ! workprefs.address_space_24;
+       int rtg = (!workprefs.address_space_24 || !workprefs.rtgmem_type) && workprefs.rtgmem_size;
 #ifndef PICASSO96
        rtg = FALSE;
 #endif
@@ -13896,12 +13896,22 @@ static void values_to_hw3ddlg (HWND hDlg)
        SendDlgItemMessage (hDlg, IDC_FILTERAUTOSCALE, CB_SETCURSEL, workprefs.gfx_filter_autoscale, 0);
 
        SendDlgItemMessage (hDlg, IDC_FILTERSTACK, CB_RESETCONTENT, 0, 0);
-       for (int i = -4; i <= 3; i++) {
-               int j = i < 0 ? i : i + 1;
+       for (i = -MAX_FILTERSHADERS; i < MAX_FILTERSHADERS; i++) {
+               j = i < 0 ? i : i + 1;
+               if (i == 0) {
+                       _stprintf (tmp, _T("%d%s"), 0, workprefs.gfx_filtershader[2 * MAX_FILTERSHADERS][0] ? _T(" *") : _T(""));
+                       SendDlgItemMessage (hDlg, IDC_FILTERSTACK, CB_ADDSTRING, 0, (LPARAM)tmp);
+               }
                _stprintf (tmp, _T("%d%s"), j, workprefs.gfx_filtershader[i + 4][0] ? _T(" *") : _T(""));
                SendDlgItemMessage (hDlg, IDC_FILTERSTACK, CB_ADDSTRING, 0, (LPARAM)tmp);
        }
-       SendDlgItemMessage (hDlg, IDC_FILTERSTACK, CB_SETCURSEL, filterstackpos, 0);
+
+       i = filterstackpos;
+       if (i == 2 * MAX_FILTERSHADERS)
+               i = MAX_FILTERSHADERS;
+       else if (i >= MAX_FILTERSHADERS)
+               i++;
+       SendDlgItemMessage (hDlg, IDC_FILTERSTACK, CB_SETCURSEL, i, 0);
 
        int range1 = workprefs.gfx_filter_autoscale == AUTOSCALE_MANUAL ? -1 : -9999;
        int range2 = workprefs.gfx_filter_autoscale == AUTOSCALE_MANUAL ? 1800 : 9999;
@@ -13980,7 +13990,7 @@ static void values_to_hw3ddlg (HWND hDlg)
                                !_tcsicmp (ext, _T(".bmp"))))
                        {
                                SendDlgItemMessage (hDlg, IDC_FILTEROVERLAY, CB_ADDSTRING, 0, (LPARAM)wfd.cFileName);
-                               if (!_tcsicmp (wfd.cFileName, overlaytype == 0 ? workprefs.gfx_filteroverlay : workprefs.gfx_filtermask[0]))
+                               if (!_tcsicmp (wfd.cFileName, overlaytype == 0 ? workprefs.gfx_filteroverlay : workprefs.gfx_filtermask[filterstackpos]))
                                        SendDlgItemMessage (hDlg, IDC_FILTEROVERLAY, CB_SETCURSEL, j, 0);
                                j++;
 
@@ -14272,7 +14282,7 @@ static void filter_handle (HWND hDlg)
        }
 
        int overlaytype = SendDlgItemMessage (hDlg, IDC_FILTEROVERLAYTYPE, CB_GETCURSEL, 0, 0L);
-       TCHAR *filterptr = overlaytype == 0 ? workprefs.gfx_filteroverlay : workprefs.gfx_filtermask[0];
+       TCHAR *filterptr = overlaytype == 0 ? workprefs.gfx_filteroverlay : workprefs.gfx_filtermask[filterstackpos];
        item = SendDlgItemMessage (hDlg, IDC_FILTEROVERLAY, CB_GETCURSEL, 0, 0L);
        if (item != CB_ERR) {
                TCHAR tmp[MAX_DPATH];
@@ -14394,7 +14404,12 @@ static INT_PTR CALLBACK hw3dDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM
                                case IDC_FILTERSTACK:
                                        item = SendDlgItemMessage (hDlg, IDC_FILTERSTACK, CB_GETCURSEL, 0, 0L);
                                        if (item != CB_ERR) {
-                                               filterstackpos = item;
+                                               if (item < MAX_FILTERSHADERS)
+                                                       filterstackpos = item;
+                                               else if (item == MAX_FILTERSHADERS)
+                                                       filterstackpos = 2 * MAX_FILTERSHADERS;
+                                               else
+                                                       filterstackpos = item - 1;
                                                values_to_hw3ddlg (hDlg);
                                                enable_for_hw3ddlg (hDlg);
                                        }

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 30712745f03c8a412e856d87e72f73228e6ee145..ab98e09ab22fb5dcabbd499f3e72c73476944f77 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,6 +1,16 @@
 
 - restore only single input target to default.
 
+Beta 4:
+
+- Added new level between pre and post shaders (0 in GUI, selected by default) which
+  works exactly like pre-2.6.0 versions. Some shaders (hq2x for example) requires
+  input texture in original Amiga display resolution and output texture in final
+  output resolution or result will be quite crappy. D3D h2x really works again.
+- Some on the fly graphics config settings (uae-configuration) reset RTG state.
+- RTG screen mode selection in Display panel wasn't active if Z2 RTG was enabled.
+- AROS ROM updated.
+
 Beta 3:
 
 - Direct3D hq2x shader filter should work correctly again. (2.6.0)
@@ -9,7 +19,7 @@ Beta 3:
   recoverable. (I don't think address error recovery is used by any OS)
 - FScc, FTRAP and FBcc didn't get FPU out of NULL state. (No one cares fix)
 - extraframewait and framelatency command line parameters are also available via
-  config file too (uses win32. prefix)
+  config file (uses win32. prefix)
 
 Beta 2: