From f546020429725ce7c636a8d5f97524f2ab55fd86 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 12 Aug 2017 18:06:48 +0200
Subject: [PATCH] Silence more warnings with C89_BUILD

---
 gfx/drivers_context/gdi_ctx.c              |  8 ++++---
 gfx/drivers_context/khr_display_ctx.c      |  5 +++-
 menu/drivers_display/menu_display_vulkan.c | 27 +++++++++++-----------
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/gfx/drivers_context/gdi_ctx.c b/gfx/drivers_context/gdi_ctx.c
index 3773a6d1c8..9721530311 100644
--- a/gfx/drivers_context/gdi_ctx.c
+++ b/gfx/drivers_context/gdi_ctx.c
@@ -19,7 +19,7 @@
 
 /* necessary for mingw32 multimon defines: */
 #ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K
+#define _WIN32_WINNT 0x0500 /*_WIN32_WINNT_WIN2K */
 #endif
 
 #include <string.h>
@@ -104,9 +104,10 @@ static void gfx_ctx_gdi_update_window_title(void *data, void *data2)
 static void gfx_ctx_gdi_get_video_size(void *data,
       unsigned *width, unsigned *height)
 {
-   (void)data;
    HWND         window  = win32_get_window();
 
+   (void)data;
+
    if (!window)
    {
       RECT mon_rect;
@@ -219,9 +220,10 @@ static void gfx_ctx_gdi_input_driver(void *data,
       const char *joypad_name,
       const input_driver_t **input, void **input_data)
 {
-   (void)data;
    settings_t *settings = config_get_ptr();
 
+   (void)data;
+
 #if _WIN32_WINNT >= 0x0501
    /* winraw only available since XP */
    if (string_is_equal_fast(settings->arrays.input_driver, "raw", 4))
diff --git a/gfx/drivers_context/khr_display_ctx.c b/gfx/drivers_context/khr_display_ctx.c
index fd69cb1620..745d770055 100644
--- a/gfx/drivers_context/khr_display_ctx.c
+++ b/gfx/drivers_context/khr_display_ctx.c
@@ -113,6 +113,7 @@ static bool gfx_ctx_khr_display_set_video_mode(void *data,
       unsigned width, unsigned height,
       bool fullscreen)
 {
+   struct vulkan_display_surface_info info;
    khr_display_ctx_data_t *khr = (khr_display_ctx_data_t*)data;
 
    if (!fullscreen)
@@ -121,7 +122,9 @@ static bool gfx_ctx_khr_display_set_video_mode(void *data,
       height = 0;
    }
 
-   struct vulkan_display_surface_info info = { width, height };
+   info.width  = width;
+   info.height = height;
+
    if (!vulkan_surface_create(&khr->vk, VULKAN_WSI_DISPLAY, &info, NULL,
             0, 0, khr->swap_interval))
    {
diff --git a/menu/drivers_display/menu_display_vulkan.c b/menu/drivers_display/menu_display_vulkan.c
index 5b7577b088..e95353ef33 100644
--- a/menu/drivers_display/menu_display_vulkan.c
+++ b/menu/drivers_display/menu_display_vulkan.c
@@ -254,19 +254,20 @@ static void menu_display_vk_draw(void *data)
 
       default:
       {
-         const struct vk_draw_triangles call = {
-            vk->display.pipelines[
-               to_display_pipeline(draw->prim_type, vk->display.blend)],
-               texture,
-               texture->mipmap ?
-                  vk->samplers.mipmap_linear :
-                  (texture->default_smooth ? vk->samplers.linear : vk->samplers.nearest),
-               draw->matrix_data
-                  ? draw->matrix_data : menu_display_vk_get_default_mvp(),
-               sizeof(math_matrix_4x4),
-               &range,
-               draw->coords->vertices,
-         };
+         struct vk_draw_triangles call;
+         
+         call.pipeline     = vk->display.pipelines[
+               to_display_pipeline(draw->prim_type, vk->display.blend)];
+         call.texture      = texture;
+         call.sampler      = texture->mipmap ?
+            vk->samplers.mipmap_linear :
+            (texture->default_smooth ? vk->samplers.linear : vk->samplers.nearest);
+         call.uniform      = draw->matrix_data
+            ? draw->matrix_data : menu_display_vk_get_default_mvp();
+         call.uniform_size = sizeof(math_matrix_4x4);
+         call.vbo          = &range;
+         call.vertices     = draw->coords->vertices;
+
          vulkan_draw_triangles(vk, &call);
          break;
       }