mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

More C89_BUILD fixes

Browse Source
This commit is contained in:
twinaphex 2017-08-12 18:02:39 +02:00
parent 9c32d03c1e
commit 00412c9836
2 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gfx/drivers_font/vulkan_raster_font.c
View File

@ -271,15 +271,15 @@ static void vulkan_raster_font_render_message(
static void vulkan_raster_font_flush(vulkan_raster_t *font)
{
const struct vk_draw_triangles call = {
font->vk->pipelines.font,
&font->texture_optimal,
font->vk->samplers.mipmap_linear,
&font->vk->mvp,
sizeof(font->vk->mvp),
&font->range,
font->vertices,
};
struct vk_draw_triangles call;
call.pipeline = font->vk->pipelines.font;
call.texture = &font->texture_optimal;
call.sampler = font->vk->samplers.mipmap_linear;
call.uniform = &font->vk->mvp;
call.uniform_size = sizeof(font->vk->mvp);
call.vbo = &font->range;
call.vertices = font->vertices;
if(font->needs_update)
{

36
ui/drivers/win32/ui_win32_browser_window.c
View File

@ -25,17 +25,33 @@
static bool ui_browser_window_win32_core(ui_browser_window_state_t *state, bool save)
{
OPENFILENAME ofn = {};
OPENFILENAME ofn;
ofn.lStructSize = sizeof(OPENFILENAME);
ofn.hwndOwner = (HWND)state->window;
ofn.lpstrFilter = state->filters; /* actually const */
ofn.lpstrFile = state->path;
ofn.lpstrTitle = state->title;
ofn.lpstrInitialDir = state->startdir;
ofn.lpstrDefExt = "";
ofn.nMaxFile = PATH_MAX;
ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
ofn.lStructSize = sizeof(OPENFILENAME);
ofn.hwndOwner = (HWND)state->window;
ofn.hInstance = NULL;
ofn.lpstrFilter = state->filters; /* actually const */
ofn.lpstrCustomFilter = NULL;
ofn.nMaxCustFilter = 0;
ofn.nFilterIndex = 0;
ofn.lpstrFile = state->path;
ofn.nMaxFile = PATH_MAX;
ofn.lpstrFileTitle = NULL;
ofn.nMaxFileTitle = 0;
ofn.lpstrInitialDir = state->startdir;
ofn.lpstrTitle = state->title;
ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
ofn.nFileOffset = 0;
ofn.nFileExtension = 0;
ofn.lpstrDefExt = "";
ofn.lCustData = 0;
ofn.lpfnHook = NULL;
ofn.lpTemplateName = NULL;
#if (_WIN32_WINNT >= 0x0500)
ofn.pvReserved = NULL;
ofn.dwReserved = 0;
ofn.FlagsEx = 0;
#endif
if (!save && !GetOpenFileName(&ofn))
return false;