Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-11 00:28:49 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

02159: cubeqst: Cubequest asserts on ATI hardware w/ prescale > 1

Browse Source 
Added 1:1 fallback if surface creation fails at prescale values. Changed
prescale logic to create prescale target surfaces as ARGB for YUY2 
sources. Forced the use of render-to-texture over StretchRect for YUY2
sources.
This commit is contained in:
Aaron Giles 2008-08-26 04:38:29 +00:00
parent dd914fb758
commit 6ccd121185
1 changed files with 51 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/osd/windows/drawd3d.c
View File

@ -1689,6 +1689,7 @@ static texture_info *texture_create(d3d_info *d3d, const render_texinfo *texsour
DWORD usage = d3d->dynamic_supported ? D3DUSAGE_DYNAMIC : 0; DWORD usage = d3d->dynamic_supported ? D3DUSAGE_DYNAMIC : 0;
DWORD pool = d3d->dynamic_supported ? D3DPOOL_DEFAULT : D3DPOOL_MANAGED; DWORD pool = d3d->dynamic_supported ? D3DPOOL_DEFAULT : D3DPOOL_MANAGED;
int maxdim = MAX(d3d->presentation.BackBufferWidth, d3d->presentation.BackBufferHeight); int maxdim = MAX(d3d->presentation.BackBufferWidth, d3d->presentation.BackBufferHeight);
int attempt;
// pick the format // pick the format
if (PRIMFLAG_GET_TEXFORMAT(flags) == TEXFORMAT_YUY16) if (PRIMFLAG_GET_TEXFORMAT(flags) == TEXFORMAT_YUY16)
@ -1710,27 +1711,38 @@ static texture_info *texture_create(d3d_info *d3d, const render_texinfo *texsour
if (texture->xprescale != video_config.prescale || texture->yprescale != video_config.prescale) if (texture->xprescale != video_config.prescale || texture->yprescale != video_config.prescale)
mame_printf_verbose("Direct3D: adjusting prescale from %dx%d to %dx%d\n", video_config.prescale, video_config.prescale, texture->xprescale, texture->yprescale); mame_printf_verbose("Direct3D: adjusting prescale from %dx%d to %dx%d\n", video_config.prescale, video_config.prescale, texture->xprescale, texture->yprescale);
// loop until we allocate something or error
for (attempt = 0; attempt < 2; attempt++)
{
// second attempt is always 1:1
if (attempt == 1)
texture->xprescale = texture->yprescale = 1;
// screen textures with no prescaling are pretty easy // screen textures with no prescaling are pretty easy
if (texture->xprescale == 1 && texture->yprescale == 1) if (texture->xprescale == 1 && texture->yprescale == 1)
{ {
result = (*d3dintf->device.create_texture)(d3d->device, texture->rawwidth, texture->rawheight, 1, usage, format, pool, &texture->d3dtex); result = (*d3dintf->device.create_texture)(d3d->device, texture->rawwidth, texture->rawheight, 1, usage, format, pool, &texture->d3dtex);
if (result != D3D_OK) if (result == D3D_OK)
goto error; {
texture->d3dfinaltex = texture->d3dtex; texture->d3dfinaltex = texture->d3dtex;
texture->type = d3d->dynamic_supported ? TEXTURE_TYPE_DYNAMIC : TEXTURE_TYPE_PLAIN; texture->type = d3d->dynamic_supported ? TEXTURE_TYPE_DYNAMIC : TEXTURE_TYPE_PLAIN;
break;
}
} }
// screen textures with prescaling require two allocations // screen textures with prescaling require two allocations
else else
{ {
int scwidth, scheight; int scwidth, scheight;
int finalfmt;
// use an offscreen plain surface for stretching if supported // use an offscreen plain surface for stretching if supported
if (d3d->stretch_supported) // (won't work for YUY textures)
if (d3d->stretch_supported && PRIMFLAG_GET_TEXFORMAT(flags) != TEXFORMAT_YUY16)
{ {
result = (*d3dintf->device.create_offscreen_plain_surface)(d3d->device, texture->rawwidth, texture->rawheight, format, D3DPOOL_DEFAULT, &texture->d3dsurface); result = (*d3dintf->device.create_offscreen_plain_surface)(d3d->device, texture->rawwidth, texture->rawheight, format, D3DPOOL_DEFAULT, &texture->d3dsurface);
if (result != D3D_OK) if (result != D3D_OK)
goto error; continue;
texture->type = TEXTURE_TYPE_SURFACE; texture->type = TEXTURE_TYPE_SURFACE;
} }
@ -1739,16 +1751,22 @@ static texture_info *texture_create(d3d_info *d3d, const render_texinfo *texsour
{ {
result = (*d3dintf->device.create_texture)(d3d->device, texture->rawwidth, texture->rawheight, 1, usage, format, pool, &texture->d3dtex); result = (*d3dintf->device.create_texture)(d3d->device, texture->rawwidth, texture->rawheight, 1, usage, format, pool, &texture->d3dtex);
if (result != D3D_OK) if (result != D3D_OK)
goto error; continue;
texture->type = d3d->dynamic_supported ? TEXTURE_TYPE_DYNAMIC : TEXTURE_TYPE_PLAIN; texture->type = d3d->dynamic_supported ? TEXTURE_TYPE_DYNAMIC : TEXTURE_TYPE_PLAIN;
} }
// for the target surface, we allocate a render target texture // for the target surface, we allocate a render target texture
scwidth = texture->rawwidth * texture->xprescale; scwidth = texture->rawwidth * texture->xprescale;
scheight = texture->rawheight * texture->yprescale; scheight = texture->rawheight * texture->yprescale;
result = (*d3dintf->device.create_texture)(d3d->device, scwidth, scheight, 1, D3DUSAGE_RENDERTARGET, format, D3DPOOL_DEFAULT, &texture->d3dfinaltex);
if (result != D3D_OK) // target surfaces typically cannot be YCbCr, so we always pick RGB in that case
goto error; finalfmt = (format != d3d->yuv_format) ? format : D3DFMT_A8R8G8B8;
result = (*d3dintf->device.create_texture)(d3d->device, scwidth, scheight, 1, D3DUSAGE_RENDERTARGET, finalfmt, D3DPOOL_DEFAULT, &texture->d3dfinaltex);
if (result == D3D_OK)
break;
(*d3dintf->texture.release)(texture->d3dtex);
texture->d3dtex = NULL;
}
} }
} }