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

(D3D) Add some more ifdefs for portability purposes

Browse Source
This commit is contained in:
twinaphex 2014-01-09 19:52:01 +01:00
parent c32fc07b3f
commit feb11c525c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/d3d9/d3d.cpp
View File

@ -446,7 +446,7 @@ static void d3d_set_viewport(void *data, int x, int y, unsigned width, unsigned
D3DVideo *d3d = reinterpret_cast<D3DVideo*>(data); D3DVideo *d3d = reinterpret_cast<D3DVideo*>(data);
D3DVIEWPORT viewport; D3DVIEWPORT viewport;
// D3D9 doesn't support negative X/Y viewports ... // D3D doesn't support negative X/Y viewports ...
if (x < 0) if (x < 0)
x = 0; x = 0;
if (y < 0) if (y < 0)
@ -608,8 +608,8 @@ static bool d3d_alive(void *data)
TranslateMessage(&msg); TranslateMessage(&msg);
DispatchMessage(&msg); DispatchMessage(&msg);
} }
#endif
return !Callback::quit; return !Callback::quit;
#endif
} }
static bool d3d_focus(void *data) static bool d3d_focus(void *data)
@ -763,7 +763,7 @@ static bool d3d_set_shader(void *data, enum rarch_shader_type type, const char *
if (!d3d_process_shader(d3d) || !d3d_restore(d3d)) if (!d3d_process_shader(d3d) || !d3d_restore(d3d))
{ {
RARCH_ERR("[D3D9]: Setting shader failed.\n"); RARCH_ERR("[D3D]: Setting shader failed.\n");
restore_old = true; restore_old = true;
} }
@ -1126,6 +1126,7 @@ bool d3d_construct(void *data, const video_info_t *info, const input_driver_t **
unsigned win_width = d3d->screen_width; unsigned win_width = d3d->screen_width;
unsigned win_height = d3d->screen_height; unsigned win_height = d3d->screen_height;
#ifdef HAVE_WINDOW
if (!info->fullscreen) if (!info->fullscreen)
{ {
RECT rect = {0}; RECT rect = {0};
@ -1136,7 +1137,6 @@ bool d3d_construct(void *data, const video_info_t *info, const input_driver_t **
win_height = rect.bottom - rect.top; win_height = rect.bottom - rect.top;
} }
#ifdef HAVE_WINDOW
char buffer[128]; char buffer[128];
gfx_get_fps(buffer, sizeof(buffer), NULL, 0); gfx_get_fps(buffer, sizeof(buffer), NULL, 0);
std::string title = buffer; std::string title = buffer;
@ -1176,10 +1176,10 @@ bool d3d_construct(void *data, const video_info_t *info, const input_driver_t **
enum rarch_shader_type type = gfx_shader_parse_type(g_settings.video.shader_path, RARCH_SHADER_NONE); enum rarch_shader_type type = gfx_shader_parse_type(g_settings.video.shader_path, RARCH_SHADER_NONE);
if (g_settings.video.shader_enable && type == RARCH_SHADER_CG) if (g_settings.video.shader_enable && type == RARCH_SHADER_CG)
d3d->cg_shader = g_settings.video.shader_path; d3d->cg_shader = g_settings.video.shader_path;
#endif
if (!d3d_process_shader(d3d)) if (!d3d_process_shader(d3d))
return false; return false;
#endif
d3d->video_info = *info; d3d->video_info = *info;
if (!d3d_initialize(d3d, &d3d->video_info)) if (!d3d_initialize(d3d, &d3d->video_info))

2
gfx/d3d9/d3d9_pc.cpp
View File

@ -369,4 +369,4 @@ void d3d_deinit_font(void *data)
if (d3d->font) if (d3d->font)
d3d->font->Release(); d3d->font->Release();
d3d->font = NULL; d3d->font = NULL;
} }