summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/windows
diff options
context:
space:
mode:
author Ryan Holtz <rholtz@batcountryentertainment.com>2012-12-29 20:11:06 +0000
committer Ryan Holtz <rholtz@batcountryentertainment.com>2012-12-29 20:11:06 +0000
commitae9f7ca3dbdb6474001ae89e90c9151a1cda8d81 (patch)
tree1302769c073953980fa4296950052a122265b400 /src/osd/windows
parent7ac7337552951cfda63506ace0a08a82192d9ef4 (diff)
(nw) Fixes HLSL bugs with Rocket Knight Adventures
Diffstat (limited to 'src/osd/windows')
-rw-r--r--src/osd/windows/d3dhlsl.c185
-rw-r--r--src/osd/windows/d3dhlsl.h21
-rw-r--r--src/osd/windows/drawd3d.c48
-rw-r--r--src/osd/windows/drawd3d.h9
-rw-r--r--src/osd/windows/winmain.c4
5 files changed, 172 insertions, 95 deletions
diff --git a/src/osd/windows/d3dhlsl.c b/src/osd/windows/d3dhlsl.c
index 28eda4201ab..c54761a674d 100644
--- a/src/osd/windows/d3dhlsl.c
+++ b/src/osd/windows/d3dhlsl.c
@@ -193,8 +193,8 @@ hlsl_info::hlsl_info()
master_enable = false;
prescale_size_x = 1;
prescale_size_y = 1;
- prescale_force_x = 0;
- prescale_force_y = 0;
+ prescale_force_x = 1;
+ prescale_force_y = 1;
preset = -1;
shadow_texture = NULL;
options = NULL;
@@ -571,7 +571,7 @@ void hlsl_info::begin_avi_recording(const char *name)
//============================================================
-// remove_render_target - remove an active cache target when
+// remove_cache_target - remove an active cache target when
// refcount hits zero
//============================================================
@@ -581,7 +581,7 @@ void hlsl_info::remove_cache_target(d3d_cache_target *cache)
{
if (cache == cachehead)
{
- cachehead= cachehead->next;
+ cachehead = cachehead->next;
}
if (cache->prev != NULL)
@@ -605,8 +605,20 @@ void hlsl_info::remove_cache_target(d3d_cache_target *cache)
void hlsl_info::remove_render_target(d3d_texture_info *texture)
{
- d3d_render_target *rt = find_render_target(texture);
+ remove_render_target(find_render_target(texture));
+}
+
+void hlsl_info::remove_render_target(int width, int height, UINT32 screen_index, UINT32 page_index)
+{
+ d3d_render_target *target = find_render_target(width, height, screen_index, page_index);
+ if (target != NULL)
+ {
+ remove_render_target(target);
+ }
+}
+void hlsl_info::remove_render_target(d3d_render_target *rt)
+{
if (rt != NULL)
{
if (rt == targethead)
@@ -624,16 +636,21 @@ void hlsl_info::remove_render_target(d3d_texture_info *texture)
rt->next->prev = rt->prev;
}
- d3d_cache_target *cache = find_cache_target(rt->screen_index);
+ d3d_cache_target *cache = find_cache_target(rt->screen_index, rt->width, rt->height);
if (cache != NULL)
{
- cache->ref_count--;
- if (cache->ref_count == 0)
- {
- remove_cache_target(cache);
- }
+ remove_cache_target(cache);
}
+
+ int screen_index = rt->screen_index;
+ int other_page = 1 - rt->page_index;
+ int width = rt->width;
+ int height = rt->height;
+
global_free(rt);
+
+ // Remove other double-buffered page (if it exists)
+ remove_render_target(width, height, screen_index, other_page);
}
}
@@ -986,6 +1003,9 @@ int hlsl_info::create_resources()
shadow_texture = texture_create(d3d, &texture, PRIMFLAG_BLENDMODE(BLENDMODE_ALPHA) | PRIMFLAG_TEXFORMAT(TEXFORMAT_ARGB32));
}
+ prescale_force_x = 1;
+ prescale_force_y = 1;
+
if(!read_ini)
{
prescale_force_x = winoptions.d3d_hlsl_prescale_x();
@@ -1038,6 +1058,14 @@ int hlsl_info::create_resources()
options->yiq_scan_time = winoptions.screen_yiq_scan_time();
options->yiq_phase_count = winoptions.screen_yiq_phase_count();
}
+ if (!prescale_force_x)
+ {
+ prescale_force_x = 1;
+ }
+ if (!prescale_force_y)
+ {
+ prescale_force_y = 1;
+ }
g_slider_list = init_slider_list();
const char *fx_dir = downcast<windows_options &>(window->machine().options()).screen_post_fx_dir();
@@ -1287,7 +1315,28 @@ d3d_render_target* hlsl_info::find_render_target(d3d_texture_info *info)
{
d3d_render_target *curr = targethead;
- while (curr != NULL && curr->info != info)
+ UINT32 screen_index_data = (UINT32)info->texinfo.osddata;
+ UINT32 screen_index = screen_index_data >> 1;
+ UINT32 page_index = screen_index_data & 1;
+
+ while (curr != NULL && (curr->screen_index != screen_index || curr->page_index != page_index || curr->width != info->texinfo.width || curr->height != info->texinfo.height))
+ {
+ curr = curr->next;
+ }
+
+ return curr;
+}
+
+
+//============================================================
+// hlsl_info::find_render_target
+//============================================================
+
+d3d_render_target* hlsl_info::find_render_target(int width, int height, UINT32 screen_index, UINT32 page_index)
+{
+ d3d_render_target *curr = targethead;
+
+ while (curr != NULL && (curr->width != width || curr->height != height || curr->screen_index != screen_index || curr->page_index != page_index))
{
curr = curr->next;
}
@@ -1300,11 +1349,11 @@ d3d_render_target* hlsl_info::find_render_target(d3d_texture_info *info)
// hlsl_info::find_cache_target
//============================================================
-d3d_cache_target* hlsl_info::find_cache_target(int screen_index)
+d3d_cache_target* hlsl_info::find_cache_target(UINT32 screen_index, int width, int height)
{
d3d_cache_target *curr = cachehead;
- while (curr != NULL && curr->screen_index != screen_index)
+ while (curr != NULL && (curr->screen_index != screen_index || curr->width != width || curr->height != height))
{
curr = curr->next;
}
@@ -1332,7 +1381,7 @@ void hlsl_info::render_quad(d3d_poly_info *poly, int vertnum)
{
return;
}
- d3d_cache_target *ct = find_cache_target(rt->screen_index);
+ d3d_cache_target *ct = find_cache_target(rt->screen_index, poly->texture->texinfo.width, poly->texture->texinfo.height);
if(options->yiq_enable)
{
@@ -1782,60 +1831,35 @@ void hlsl_info::end()
//============================================================
-// hlsl_info::register_texture
+// hlsl_info::register_prescaled_texture
//============================================================
-int hlsl_info::register_prescaled_texture(d3d_texture_info *texture, int scwidth, int scheight)
+bool hlsl_info::register_prescaled_texture(d3d_texture_info *texture)
{
- if (!master_enable || !d3dintf->post_fx_available)
- return 0;
-
- d3d_info *d3d = (d3d_info *)window->drawdata;
-
- // Find the nearest prescale factor that is over our screen size
- int hlsl_prescale_x = prescale_force_x ? prescale_force_x : 1;
- if(!prescale_force_x)
- {
- while(scwidth * hlsl_prescale_x < d3d->width) hlsl_prescale_x++;
- prescale_size_x = hlsl_prescale_x;
- }
-
- int hlsl_prescale_y = prescale_force_y ? prescale_force_y : 1;
- if(!prescale_force_y)
- {
- while(scheight * hlsl_prescale_y < d3d->height) hlsl_prescale_y++;
- prescale_size_y = hlsl_prescale_y;
- }
-
- if (!add_render_target(d3d, texture, scwidth, scheight, hlsl_prescale_x, hlsl_prescale_y))
- return 1;
-
- options->params_dirty = true;
-
- enumerate_screens();
-
- return 0;
+ return register_texture(texture, texture->rawwidth, texture->rawheight, texture->xprescale, texture->yprescale);
}
//============================================================
// hlsl_info::add_cache_target - register a cache target
//============================================================
-bool hlsl_info::add_cache_target(d3d_info* d3d, d3d_texture_info* info, int width, int height, int prescale_x, int prescale_y, int screen_index)
+bool hlsl_info::add_cache_target(d3d_info* d3d, d3d_texture_info* info, int width, int height, int xprescale, int yprescale, int screen_index)
{
d3d_cache_target* target = (d3d_cache_target*)global_alloc_clear(d3d_cache_target);
- if (!target->init(d3d, d3dintf, width, height, prescale_x, prescale_y))
+ if (!target->init(d3d, d3dintf, width, height, xprescale, yprescale))
{
global_free(target);
return false;
}
+ target->width = info->texinfo.width;
+ target->height = info->texinfo.height;
+
target->next = cachehead;
target->prev = NULL;
target->screen_index = screen_index;
- target->ref_count = 1;
if (cachehead != NULL)
{
@@ -1850,11 +1874,20 @@ bool hlsl_info::add_cache_target(d3d_info* d3d, d3d_texture_info* info, int widt
// hlsl_info::add_render_target - register a render target
//============================================================
-bool hlsl_info::add_render_target(d3d_info* d3d, d3d_texture_info* info, int width, int height, int prescale_x, int prescale_y)
+bool hlsl_info::add_render_target(d3d_info* d3d, d3d_texture_info* info, int width, int height, int xprescale, int yprescale)
{
+ if (find_render_target(info))
+ {
+ remove_render_target(info);
+ }
+
+ UINT32 screen_index_data = (UINT32)info->texinfo.osddata;
+ UINT32 screen_index = screen_index_data >> 1;
+ UINT32 page_index = screen_index_data & 1;
+
d3d_render_target* target = (d3d_render_target*)global_alloc_clear(d3d_render_target);
- if (!target->init(d3d, d3dintf, width, height, prescale_x, prescale_y))
+ if (!target->init(d3d, d3dintf, width, height, xprescale, yprescale))
{
global_free(target);
return false;
@@ -1862,23 +1895,21 @@ bool hlsl_info::add_render_target(d3d_info* d3d, d3d_texture_info* info, int wid
target->info = info;
- UINT32 screen_index_data = (UINT32)info->texinfo.osddata;
- target->screen_index = screen_index_data >> 1;
- target->page_index = screen_index_data & 1;
+ target->width = info->texinfo.width;
+ target->height = info->texinfo.height;
- d3d_cache_target* cache = find_cache_target(target->screen_index);
+ target->screen_index = screen_index;
+ target->page_index = page_index;
+
+ d3d_cache_target* cache = find_cache_target(target->screen_index, info->texinfo.width, info->texinfo.height);
if (cache == NULL)
{
- if (!add_cache_target(d3d, info, width, height, prescale_x, prescale_y, target->screen_index))
+ if (!add_cache_target(d3d, info, width, height, xprescale * prescale_force_x, yprescale * prescale_force_y, target->screen_index))
{
global_free(target);
return false;
}
}
- else
- {
- cache->ref_count++;
- }
target->next = targethead;
target->prev = NULL;
@@ -1901,40 +1932,40 @@ void hlsl_info::enumerate_screens()
num_screens = iter.count();
}
+
//============================================================
// hlsl_info::register_texture
//============================================================
-int hlsl_info::register_texture(d3d_texture_info *texture)
+bool hlsl_info::register_texture(d3d_texture_info *texture)
{
- enumerate_screens();
+ return register_texture(texture, texture->rawwidth, texture->rawheight, 1, 1);
+}
+
+//============================================================
+// hlsl_info::register_texture(d3d_texture_info, int, int, int, int)
+//============================================================
+
+bool hlsl_info::register_texture(d3d_texture_info *texture, int width, int height, int xscale, int yscale)
+{
if (!master_enable || !d3dintf->post_fx_available)
return 0;
+ enumerate_screens();
+
d3d_info *d3d = (d3d_info *)window->drawdata;
// Find the nearest prescale factor that is over our screen size
- int hlsl_prescale_x = prescale_force_x ? prescale_force_x : 1;
- if(!prescale_force_x)
- {
- while(texture->rawwidth * hlsl_prescale_x < d3d->width) hlsl_prescale_x++;
- prescale_size_x = hlsl_prescale_x;
- }
-
- int hlsl_prescale_y = prescale_force_y ? prescale_force_y : 1;
- if(!prescale_force_y)
- {
- while(texture->rawheight * hlsl_prescale_y < d3d->height) hlsl_prescale_y++;
- prescale_size_y = hlsl_prescale_y;
- }
+ int hlsl_prescale_x = prescale_force_x;
+ int hlsl_prescale_y = prescale_force_y;
- if (!add_render_target(d3d, texture, texture->rawwidth, texture->rawheight, hlsl_prescale_x, hlsl_prescale_y))
- return 1;
+ if (!add_render_target(d3d, texture, width, height, xscale * hlsl_prescale_x, yscale * hlsl_prescale_y))
+ return false;
options->params_dirty = true;
- return 0;
+ return true;
}
//============================================================
diff --git a/src/osd/windows/d3dhlsl.h b/src/osd/windows/d3dhlsl.h
index efb72f3dfca..fc896a11732 100644
--- a/src/osd/windows/d3dhlsl.h
+++ b/src/osd/windows/d3dhlsl.h
@@ -116,10 +116,10 @@ public:
void render_quad(d3d_poly_info *poly, int vertnum);
void end();
- int register_texture(d3d_texture_info *texture);
- int register_prescaled_texture(d3d_texture_info *texture, int scwidth, int scheight);
- bool add_render_target(d3d_info* d3d, d3d_texture_info* info, int width, int height, int prescale_x, int prescale_y);
- bool add_cache_target(d3d_info* d3d, d3d_texture_info* info, int width, int height, int prescale_x, int prescale_y, int screen_index);
+ bool register_texture(d3d_texture_info *texture);
+ bool register_prescaled_texture(d3d_texture_info *texture);
+ bool add_render_target(d3d_info* d3d, d3d_texture_info* info, int width, int height, int xprescale, int yprescale);
+ bool add_cache_target(d3d_info* d3d, d3d_texture_info* info, int width, int height, int xprescale, int yprescale, int screen_index);
void window_save();
void window_record();
@@ -131,8 +131,11 @@ public:
void frame_complete();
- void set_texture(d3d_texture_info *texture);
- void remove_render_target(d3d_texture_info *texture);
+ void set_texture(d3d_texture_info *texture);
+ d3d_render_target * find_render_target(d3d_texture_info *info);
+ void remove_render_target(d3d_texture_info *texture);
+ void remove_render_target(int width, int height, UINT32 screen_index, UINT32 page_index);
+ void remove_render_target(d3d_render_target *rt);
int create_resources();
void delete_resources();
@@ -146,8 +149,10 @@ private:
void end_avi_recording();
void begin_avi_recording(const char *name);
- d3d_render_target * find_render_target(d3d_texture_info *info);
- d3d_cache_target * find_cache_target(int screen_index);
+ bool register_texture(d3d_texture_info *texture, int width, int height, int xscale, int yscale);
+
+ d3d_render_target* find_render_target(int width, int height, UINT32 screen_index, UINT32 page_index);
+ d3d_cache_target * find_cache_target(UINT32 screen_index, int width, int height);
void remove_cache_target(d3d_cache_target *cache);
d3d_base * d3dintf; // D3D interface
diff --git a/src/osd/windows/drawd3d.c b/src/osd/windows/drawd3d.c
index 07b61eac678..7adb6b1c694 100644
--- a/src/osd/windows/drawd3d.c
+++ b/src/osd/windows/drawd3d.c
@@ -1801,8 +1801,7 @@ d3d_texture_info *texture_create(d3d_info *d3d, const render_texinfo *texsource,
texture->d3dfinaltex = texture->d3dtex;
texture->type = d3d->dynamic_supported ? TEXTURE_TYPE_DYNAMIC : TEXTURE_TYPE_PLAIN;
- int ret = d3d->hlsl->register_texture(texture);
- if (ret != 0)
+ if (d3d->hlsl->enabled() && !d3d->hlsl->register_texture(texture))
goto error;
break;
@@ -1843,10 +1842,10 @@ d3d_texture_info *texture_create(d3d_info *d3d, const render_texinfo *texsource,
result = (*d3dintf->device.create_texture)(d3d->device, scwidth, scheight, 1, D3DUSAGE_RENDERTARGET, finalfmt, D3DPOOL_DEFAULT, &texture->d3dfinaltex);
if (result == D3D_OK)
{
- int ret = d3d->hlsl->register_prescaled_texture(texture, scwidth, scheight);
- if (ret != 0)
+ if (d3d->hlsl->enabled() && !d3d->hlsl->register_prescaled_texture(texture))
+ {
goto error;
-
+ }
break;
}
(*d3dintf->texture.release)(texture->d3dtex);
@@ -2522,21 +2521,56 @@ static d3d_texture_info *texture_find(d3d_info *d3d, const render_primitive *pri
// find a match
for (texture = d3d->texlist; texture != NULL; texture = texture->next)
{
+ UINT32 test_screen = (UINT32)texture->texinfo.osddata >> 1;
+ UINT32 test_page = (UINT32)texture->texinfo.osddata & 1;
+ UINT32 prim_screen = (UINT32)prim->texture.osddata >> 1;
+ UINT32 prim_page = (UINT32)prim->texture.osddata & 1;
+ if (test_screen != prim_screen || test_page != prim_page)
+ {
+ continue;
+ }
+
if (texture->hash == texhash &&
texture->texinfo.base == prim->texture.base &&
texture->texinfo.width == prim->texture.width &&
texture->texinfo.height == prim->texture.height &&
((texture->flags ^ prim->flags) & (PRIMFLAG_BLENDMODE_MASK | PRIMFLAG_TEXFORMAT_MASK)) == 0)
{
- return texture;
+ // Reject a texture if it belongs to an out-of-date render target, so as to cause the HLSL system to re-cache
+ if (d3d->hlsl->enabled() && prim->texture.width != 0 && prim->texture.height != 0 && (prim->flags & PRIMFLAG_SCREENTEX_MASK) != 0)
+ {
+ if (d3d->hlsl->find_render_target(texture) != NULL)
+ {
+ return texture;
+ }
+ }
+ else
+ {
+ return texture;
+ }
}
}
// nothing found, check if we need to unregister something with hlsl
- if (d3d->hlsl != NULL)
+ if (d3d->hlsl->enabled())
{
+ if (prim->texture.width == 0 || prim->texture.height == 0)
+ {
+ return NULL;
+ }
+
+ UINT32 prim_screen = (UINT32)prim->texture.osddata >> 1;
+ UINT32 prim_page = (UINT32)prim->texture.osddata & 1;
+
for (texture = d3d->texlist; texture != NULL; texture = texture->next)
{
+ UINT32 test_screen = (UINT32)texture->texinfo.osddata >> 1;
+ UINT32 test_page = (UINT32)texture->texinfo.osddata & 1;
+ if (test_screen != prim_screen || test_page != prim_page)
+ {
+ continue;
+ }
+
// Clear our old texture reference
if (texture->hash == texhash &&
texture->texinfo.base == prim->texture.base &&
diff --git a/src/osd/windows/drawd3d.h b/src/osd/windows/drawd3d.h
index dcbb22606fe..4c1e5979da5 100644
--- a/src/osd/windows/drawd3d.h
+++ b/src/osd/windows/drawd3d.h
@@ -74,8 +74,10 @@ public:
d3d_surface *last_target;
d3d_texture *last_texture;
+ int width;
+ int height;
+
int screen_index;
- int ref_count;
d3d_cache_target *next;
d3d_cache_target *prev;
@@ -93,8 +95,13 @@ public:
int target_width;
int target_height;
+
+ int width;
+ int height;
+
int screen_index;
int page_index;
+
d3d_surface *prescaletarget;
d3d_texture *prescaletexture;
d3d_surface *smalltarget;
diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c
index bc871803fbb..c63e5acd001 100644
--- a/src/osd/windows/winmain.c
+++ b/src/osd/windows/winmain.c
@@ -338,8 +338,8 @@ const options_entry windows_options::s_option_entries[] =
{ WINOPTION_HLSL_INI_READ, "0", OPTION_BOOLEAN, "enable HLSL INI reading" },
{ WINOPTION_HLSL_INI_WRITE, "0", OPTION_BOOLEAN, "enable HLSL INI writing" },
{ WINOPTION_HLSL_INI_NAME, "%g", OPTION_STRING, "HLSL INI file name for this game" },
- { WINOPTION_HLSL_PRESCALE_X, "0", OPTION_INTEGER, "HLSL pre-scale override factor for X (0 for auto)" },
- { WINOPTION_HLSL_PRESCALE_Y, "0", OPTION_INTEGER, "HLSL pre-scale override factor for Y (0 for auto)" },
+ { WINOPTION_HLSL_PRESCALE_X, "2", OPTION_INTEGER, "HLSL pre-scale override factor for X" },
+ { WINOPTION_HLSL_PRESCALE_Y, "2", OPTION_INTEGER, "HLSL pre-scale override factor for Y" },
{ WINOPTION_HLSL_PRESET";(-1-3)", "-1", OPTION_INTEGER, "HLSL preset to use (0-3)" },
{ WINOPTION_HLSL_WRITE, NULL, OPTION_STRING, "enable HLSL AVI writing (huge disk bandwidth suggested)" },
{ WINOPTION_HLSL_SNAP_WIDTH, "2048", OPTION_STRING, "HLSL upscaled-snapshot width" },