From 81cd5df96189924d0dd35c1acede59f9694cdfd7 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 12 Apr 2015 19:02:01 +0200
Subject: [PATCH] Update MSVC solutions - 360 buildfix

---
 gfx/d3d/d3d.cpp                                   | 3 +--
 gfx/d3d/d3d_wrapper.cpp                           | 2 ++
 msvc/msvc-2010/RetroArch-msvc2010.vcxproj         | 3 ++-
 msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters | 3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index 25f6bceb4d..ecf4b274c1 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -167,8 +167,7 @@ void d3d_make_d3dpp(void *data,
       unsigned width          = 0;
       unsigned height         = 0;
 
-      if (d3d->ctx_driver && d3d->ctx_driver->get_video_size)
-         d3d->ctx_driver->get_video_size(d3d, &width, &height);
+	  gfx_ctx_get_video_size(d3d, &width, &height);
 
       d3d->screen_width       = width;
       d3d->screen_height      = height;
diff --git a/gfx/d3d/d3d_wrapper.cpp b/gfx/d3d/d3d_wrapper.cpp
index 3beb8dd61a..1bbc22ba7c 100644
--- a/gfx/d3d/d3d_wrapper.cpp
+++ b/gfx/d3d/d3d_wrapper.cpp
@@ -386,10 +386,12 @@ void d3d_enable_alpha_blend_texture_func(void *data)
    if (!dev)
       return;
 
+#ifndef _XBOX360
    /* Also blend the texture with the set alpha value. */
    dev->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
    dev->SetTextureStageState(0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE);
    dev->SetTextureStageState(0, D3DTSS_ALPHAARG2, D3DTA_TEXTURE);
+#endif
 }
 
 void d3d_frame_postprocess(void *data)
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index 50dd076579..3d8e4ad867 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -189,8 +189,9 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\griffin\griffin.c" />
+    <ClCompile Include="..\..\griffin\griffin_cpp.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
index eb7b12017f..3297784a4c 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
@@ -12,5 +12,8 @@
     <ClCompile Include="..\..\griffin\griffin.c">
       <Filter>griffin</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\griffin\griffin_cpp.cpp">
+      <Filter>griffin</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file