Update MSVC 2012 solution

2025-02-21 18:40:09 +00:00 · 2018-08-16 20:49:31 +02:00 · 2018-08-16 20:49:31 +02:00 · a1d5b0fd03
commit a1d5b0fd03
parent 12539f310d
7 changed files with 181 additions and 171 deletions
--- a/gfx/common/dxgi_common.h
+++ b/gfx/common/dxgi_common.h
@ -804,6 +804,7 @@ RETRO_END_DECLS

 #ifndef PERF_START
 #define PERF_START() \
+   { \
   static struct retro_perf_counter perfcounter = { __FUNCTION__ }; \
   LARGE_INTEGER                    start, stop; \
   rarch_perf_register(&perfcounter); \
@ -812,7 +813,8 @@ RETRO_END_DECLS

 #define PERF_STOP() \
   QueryPerformanceCounter(&stop); \
-   perfcounter.total += stop.QuadPart - start.QuadPart
+   perfcounter.total += stop.QuadPart - start.QuadPart; \
+   }
 #endif
 #else
 #define PERF_START()
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@ -1969,10 +1969,11 @@ static bool vulkan_create_display_surface(gfx_ctx_vulkan_data_t *vk,
 retry:
   for (dpy = 0; dpy < display_count; dpy++)
   {
+      VkDisplayKHR display;
      if (monitor_index != 0 && (monitor_index - 1) != dpy)
         continue;

-      VkDisplayKHR display = displays[dpy].display;
+      display    = displays[dpy].display;
      best_mode  = VK_NULL_HANDLE;
      best_plane = UINT32_MAX;

--- a/gfx/drivers/d3d10.c
+++ b/gfx/drivers/d3d10.c
@ -43,7 +43,7 @@ static void d3d10_free_overlays(d3d10_video_t* d3d10)
   Release(d3d10->overlays.vbo);
 }

-static void
+   static void
 d3d10_overlay_vertex_geom(void* data, unsigned index, float x, float y, float w, float h)
 {
   d3d10_sprite_t* sprites = NULL;
@ -1571,7 +1571,7 @@ static void d3d10_gfx_unload_texture(void* data, uintptr_t handle)
 }

 #if 0
-static bool
+   static bool
 d3d10_get_hw_render_interface(void* data, const struct retro_hw_render_interface** iface)
 {
   d3d10_video_t* d3d10 = (d3d10_video_t*)data;
--- a/gfx/drivers/d3d11.c
+++ b/gfx/drivers/d3d11.c
@ -55,7 +55,7 @@ static void d3d11_free_overlays(d3d11_video_t* d3d11)
   Release(d3d11->overlays.vbo);
 }

-static void
+   static void
 d3d11_overlay_vertex_geom(void* data, unsigned index, float x, float y, float w, float h)
 {
   D3D11_MAPPED_SUBRESOURCE mapped_vbo;
@ -230,6 +230,7 @@ static void d3d11_set_filtering(void* data, unsigned index, bool smooth)
 static void d3d11_gfx_set_rotation(void* data, unsigned rotation)
 {
   math_matrix_4x4 rot;
+   D3D11_MAPPED_SUBRESOURCE mapped_ubo;
   d3d11_video_t*  d3d11 = (d3d11_video_t*)data;

   if (!d3d11)
@ -238,7 +239,6 @@ static void d3d11_gfx_set_rotation(void* data, unsigned rotation)
   matrix_4x4_rotate_z(rot, rotation * (M_PI / 2.0f));
   matrix_4x4_multiply(d3d11->mvp, rot, d3d11->ubo_values.mvp);

-   D3D11_MAPPED_SUBRESOURCE mapped_ubo;
   D3D11MapBuffer(d3d11->context, d3d11->frame.ubo, 0, D3D11_MAP_WRITE_DISCARD, 0, &mapped_ubo);
   *(math_matrix_4x4*)mapped_ubo.pData = d3d11->mvp;
   D3D11UnmapBuffer(d3d11->context, d3d11->frame.ubo, 0);
@ -318,7 +318,8 @@ static bool d3d11_gfx_set_shader(void* data, enum rarch_shader_type type, const
 {
 #if defined(HAVE_SLANG) && defined(HAVE_SPIRV_CROSS)
   unsigned         i;
-   d3d11_texture_t* source;
+   config_file_t* conf     = NULL;
+   d3d11_texture_t* source = NULL;
   d3d11_video_t*   d3d11  = (d3d11_video_t*)data;

   if (!d3d11)
@ -336,7 +337,7 @@ static bool d3d11_gfx_set_shader(void* data, enum rarch_shader_type type, const
      return false;
   }

-   config_file_t* conf = config_file_new(path);
+   conf = config_file_new(path);

   if (!conf)
      return false;
@ -569,7 +570,7 @@ static void d3d11_gfx_free(void* data)
   free(d3d11);
 }

-static void*
+   static void*
 d3d11_gfx_init(const video_info_t* video, const input_driver_t** input, void** input_data)
 {
   unsigned       i;
@ -1596,7 +1597,7 @@ static void d3d11_gfx_unload_texture(void* data, uintptr_t handle)
   free(texture);
 }

-static bool
+   static bool
 d3d11_get_hw_render_interface(void* data, const struct retro_hw_render_interface** iface)
 {
   d3d11_video_t* d3d11 = (d3d11_video_t*)data;
--- a/menu/drivers_display/menu_display_d3d10.c
+++ b/menu/drivers_display/menu_display_d3d10.c
@ -208,9 +208,11 @@ static void menu_display_d3d10_draw_pipeline(menu_display_ctx_draw_t* draw,
            desc.ByteWidth         = ca->coords.vertices * 2 * sizeof(float);
            desc.BindFlags         = D3D10_BIND_VERTEX_BUFFER;

+			{
               D3D10_SUBRESOURCE_DATA vertexData = { ca->coords.vertex };
               D3D10CreateBuffer(d3d10->device, &desc, &vertexData, &d3d10->menu_pipeline_vbo);
 			}
+         }
         D3D10SetVertexBuffer(d3d10->device, 0, d3d10->menu_pipeline_vbo, 2 * sizeof(float), 0);
         draw->coords->vertices = ca->coords.vertices;
         D3D10SetBlendState(d3d10->device, d3d10->blend_pipeline, NULL, D3D10_DEFAULT_SAMPLE_MASK);
--- a/menu/drivers_display/menu_display_d3d11.c
+++ b/menu/drivers_display/menu_display_d3d11.c
@ -207,9 +207,11 @@ static void menu_display_d3d11_draw_pipeline(menu_display_ctx_draw_t *draw,
            desc.ByteWidth         = ca->coords.vertices * 2 * sizeof(float);
            desc.BindFlags         = D3D11_BIND_VERTEX_BUFFER;

+			{
               D3D11_SUBRESOURCE_DATA vertexData = { ca->coords.vertex };
               D3D11CreateBuffer(d3d11->device, &desc, &vertexData, &d3d11->menu_pipeline_vbo);
 			}
+         }
         D3D11SetVertexBuffer(d3d11->context, 0, d3d11->menu_pipeline_vbo, 2 * sizeof(float), 0);
         draw->coords->vertices = ca->coords.vertices;
         D3D11SetBlendState(d3d11->context, d3d11->blend_pipeline, NULL, D3D11_DEFAULT_SAMPLE_MASK);
--- a/pkg/msvc/msvc-2012/RetroArch-msvc2012.vcxproj
+++ b/pkg/msvc/msvc-2012/RetroArch-msvc2012.vcxproj
@ -52,7 +52,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WANT_GLSLANG;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_SPIRV_CROSS;HAVE_MENU;HAVE_SLANG;HAVE_GLSLANG;HAVE_UPDATE_ASSETS;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_RGUI;HAVE_MATERIALUI;NDEBUG;_WINDOWS;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DINPUT;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_OPENGL;HAVE_VULKAN;HAVE_GLSL;HAVE_THREADS;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_RJPEG;HAVE_RPNG;HAVE_ZLIB;WANT_ZLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_OVERLAY;HAVE_7ZIP;HAVE_LIBRETRODB;HAVE_STB_FONT;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\deps;$(SolutionDir)\..\..\gfx\include;$(SolutionDir)\..\..\gfx\include\dxsdk;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\deps\SPIRV-Cross;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
@ -67,7 +68,8 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WANT_GLSLANG;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_SPIRV_CROSS;HAVE_MENU;HAVE_SLANG;HAVE_GLSLANG;HAVE_UPDATE_ASSETS;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_RGUI;HAVE_MATERIALUI;NDEBUG;_WINDOWS;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DINPUT;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_OPENGL;HAVE_VULKAN;HAVE_GLSL;HAVE_THREADS;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_RJPEG;HAVE_RPNG;HAVE_ZLIB;WANT_ZLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_OVERLAY;HAVE_7ZIP;HAVE_LIBRETRODB;HAVE_STB_FONT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\..\deps;$(SolutionDir)\..\..\gfx\include;$(SolutionDir)\..\..\gfx\include\dxsdk;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\deps\SPIRV-Cross;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
      <SubSystem>Windows</SubSystem>