mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

enable Cg shader flag for d3d9

Browse Source
This commit is contained in:
LazyBumHorse 2019-06-24 23:40:50 +02:00
parent f23497fd80
commit 17ec59ff21
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
gfx/drivers/d3d9.c
View File

@ -69,6 +69,11 @@
#error "UWP does not support D3D9" #error "UWP does not support D3D9"
#endif #endif
/* Temporary workaround for d3d9 not being able to poll flags during init */
static gfx_ctx_driver_t d3d9_fake_context;
static uint32_t d3d9_get_flags(void *data);
static bool d3d9_set_shader(void *data, enum rarch_shader_type type, const char *path);
static LPDIRECT3D9 g_pD3D9; static LPDIRECT3D9 g_pD3D9;
void *dinput; void *dinput;
@ -248,12 +253,12 @@ static bool d3d9_init_chain(d3d9_video_t *d3d, const video_info_t *video_info)
&d3d->renderchain_driver, &d3d->renderchain_driver,
&d3d->renderchain_data)) &d3d->renderchain_data))
{ {
RARCH_ERR("[D3D9]: Renderchain could not be initialized.\n"); RARCH_ERR("[D3D9]: Renderchain could not be initialized.\n");
return false; return false;
} }
if (!d3d->renderchain_driver || !d3d->renderchain_data) if (!d3d->renderchain_driver || !d3d->renderchain_data)
return false; return false;
if ( if (
!d3d->renderchain_driver->init( !d3d->renderchain_driver->init(
@ -494,14 +499,14 @@ static void d3d9_overlay_render(d3d9_video_t *d3d,
overlay->vert_buf = d3d9_vertex_buffer_new( overlay->vert_buf = d3d9_vertex_buffer_new(
dev, sizeof(vert), D3DUSAGE_WRITEONLY, dev, sizeof(vert), D3DUSAGE_WRITEONLY,
#ifdef _XBOX #ifdef _XBOX
0, 0,
#else #else
D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1, D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1,
#endif #endif
D3DPOOL_MANAGED, NULL); D3DPOOL_MANAGED, NULL);
if (!overlay->vert_buf) if (!overlay->vert_buf)
return; return;
} }
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
@ -989,7 +994,7 @@ static bool d3d9_initialize(d3d9_video_t *d3d, const video_info_t *info)
video_driver_get_size(&width, &height); video_driver_get_size(&width, &height);
d3d9_set_viewport(d3d, d3d9_set_viewport(d3d,
width, height, false, true); width, height, false, true);
#ifdef _XBOX #ifdef _XBOX
strlcpy(settings->paths.path_font, "game:\\media\\Arial_12.xpr", strlcpy(settings->paths.path_font, "game:\\media\\Arial_12.xpr",
@ -1022,7 +1027,7 @@ static bool d3d9_initialize(d3d9_video_t *d3d, const video_info_t *info)
#ifdef _XBOX #ifdef _XBOX
0, 0,
#else #else
D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1, D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1,
#endif #endif
D3DPOOL_DEFAULT, D3DPOOL_DEFAULT,
NULL); NULL);
@ -1265,33 +1270,22 @@ static bool d3d9_init_internal(d3d9_video_t *d3d,
win_height, info->fullscreen); win_height, info->fullscreen);
win32_set_window(&win_width, &win_height, info->fullscreen, win32_set_window(&win_width, &win_height, info->fullscreen,
windowed_full, &rect); windowed_full, &rect);
#endif #endif
/* This should only be done once here
* to avoid set_shader() to be overridden
* later. */
if (settings->bools.video_shader_enable)
{ {
enum rarch_shader_type type = const char *shader_preset;
video_shader_parse_type(retroarch_get_shader_preset()); enum rarch_shader_type type;
switch (type) d3d9_fake_context.get_flags = d3d9_get_flags;
{ video_context_driver_set(&d3d9_fake_context);
case RARCH_SHADER_CG:
if (!string_is_empty(d3d->shader_path)) shader_preset = retroarch_get_shader_preset();
free(d3d->shader_path); type = video_shader_parse_type(shader_preset);
if (!string_is_empty(retroarch_get_shader_preset()))
d3d->shader_path = strdup(retroarch_get_shader_preset()); d3d9_set_shader(d3d, type, shader_preset);
break;
default:
break;
}
} }
if (!d3d9_process_shader(d3d))
return false;
d3d->video_info = *info; d3d->video_info = *info;
if (!d3d9_initialize(d3d, &d3d->video_info)) if (!d3d9_initialize(d3d, &d3d->video_info))
@ -1482,7 +1476,7 @@ static bool d3d9_overlay_load(void *data,
image_data; image_data;
if (!d3d) if (!d3d)
return false; return false;
d3d9_free_overlays(d3d); d3d9_free_overlays(d3d);
d3d->overlays = (overlay_t*)calloc(num_images, sizeof(*d3d->overlays)); d3d->overlays = (overlay_t*)calloc(num_images, sizeof(*d3d->overlays));
@ -1823,6 +1817,8 @@ static bool d3d9_set_shader(void *data,
if (!string_is_empty(path)) if (!string_is_empty(path))
d3d->shader_path = strdup(path); d3d->shader_path = strdup(path);
break; break;
case RARCH_SHADER_NONE:
break;
default: default:
RARCH_WARN("[D3D9]: Only Cg shaders are supported. Falling back to stock.\n"); RARCH_WARN("[D3D9]: Only Cg shaders are supported. Falling back to stock.\n");
} }
@ -2017,7 +2013,7 @@ static void d3d9_unload_texture(void *data, uintptr_t id)
{ {
LPDIRECT3DTEXTURE9 texid; LPDIRECT3DTEXTURE9 texid;
if (!id) if (!id)
return; return;
texid = (LPDIRECT3DTEXTURE9)id; texid = (LPDIRECT3DTEXTURE9)id;
d3d9_texture_free(texid); d3d9_texture_free(texid);
@ -2034,10 +2030,11 @@ static void d3d9_set_video_mode(void *data,
static uint32_t d3d9_get_flags(void *data) static uint32_t d3d9_get_flags(void *data)
{ {
uint32_t flags = 0; uint32_t flags = 0;
BIT32_SET(flags, GFX_CTX_FLAGS_BLACK_FRAME_INSERTION); BIT32_SET(flags, GFX_CTX_FLAGS_BLACK_FRAME_INSERTION);
BIT32_SET(flags, GFX_CTX_FLAGS_MENU_FRAME_FILTERING); BIT32_SET(flags, GFX_CTX_FLAGS_MENU_FRAME_FILTERING);
BIT32_SET(flags, GFX_CTX_FLAGS_SHADERS_CG);
return flags; return flags;
} }