[win32] Fix compilation errors.

FernetMenta · Sep 20, 2015 · 4bb7d8b · 4bb7d8b
1 parent b0ac065
commit 4bb7d8b
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp
@@ -29,7 +29,7 @@
 #include <windows.h>
 #include "DXVAHD.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
-#include "RenderFlags.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/MediaSettings.h"
 #include "utils/Log.h"
@@ -580,7 +580,7 @@ bool CProcessorHD::Render(CRect src, CRect dst, ID3D11Resource* target, ID3D11Vi
   EDEINTERLACEMODE deinterlace_mode = CMediaSettings::GetInstance().GetCurrentVideoSettings().m_DeinterlaceMode;
   if (g_advancedSettings.m_DXVANoDeintProcForProgressive)
     deinterlace_mode = (flags & RENDER_FLAG_FIELD0 || flags & RENDER_FLAG_FIELD1) ? VS_DEINTERLACEMODE_FORCE : VS_DEINTERLACEMODE_OFF;
-  EINTERLACEMETHOD interlace_method = g_renderManager.AutoInterlaceMethod(CMediaSettings::GetInstance().GetCurrentVideoSettings().m_InterlaceMethod);
+  EINTERLACEMETHOD interlace_method = CMediaSettings::GetInstance().GetCurrentVideoSettings().m_InterlaceMethod;
 
   bool progressive = deinterlace_mode == VS_DEINTERLACEMODE_OFF
                   || (   interlace_method != VS_INTERLACEMETHOD_DXVA_BOB

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererDX.h b/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererDX.h
@@ -34,7 +34,7 @@ typedef struct ass_image ASS_Image;
 namespace OVERLAY {
 
   class COverlayQuadsDX
-    : public COverlayMainThread
+    : public COverlay
   {
   public:
     COverlayQuadsDX(ASS_Image* images, int width, int height);
@@ -49,7 +49,7 @@ namespace OVERLAY {
   };
 
   class COverlayImageDX
-    : public COverlayMainThread
+    : public COverlay
   {
   public:
     COverlayImageDX(CDVDOverlayImage* o);

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp
@@ -23,8 +23,8 @@
 #include <DirectXPackedVector.h>
 #include "WinVideoFilter.h"
 #include "windowing/WindowingFactory.h"
-#include "../../../utils/log.h"
-#include "../../../FileSystem/File.h"
+#include "../../../../utils/log.h"
+#include "../../../../FileSystem/File.h"
 #include <map>
 #include "ConvolutionKernels.h"
 #include "YUV2RGBShader.h"

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/YUV2RGBShader.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/YUV2RGBShader.cpp
@@ -94,8 +94,7 @@ void CalculateYUVMatrix(TransformMatrix &matrix
                         , unsigned int  flags
                         , ERenderFormat format
                         , float         black
-                        , float         contrast
-                        , bool          limited)
+                        , float         contrast)
 {
   TransformMatrix coef;
 
@@ -108,7 +107,7 @@ void CalculateYUVMatrix(TransformMatrix &matrix
       coef.m[row][col] = conv[col][row];
   coef.identity = false;
 
-  if(g_Windowing.UseLimitedColor() || limited)
+  if(g_Windowing.UseLimitedColor())
   {
     matrix *= TransformMatrix::CreateTranslation(+ 16.0f / 255
                                                , + 16.0f / 255

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/YUV2RGBShader.h b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/YUV2RGBShader.h
@@ -24,8 +24,6 @@
 #include "guilib/TransformMatrix.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderFormats.h"
 
-#include "GLSLOutput.h"
-
 void CalculateYUVMatrix(TransformMatrix &matrix
                         , unsigned int  flags
                         , ERenderFormat format
@@ -34,6 +32,8 @@ void CalculateYUVMatrix(TransformMatrix &matrix
 
 #if defined(HAS_GL) || HAS_GLES == 2
 
+#include "GLSLOutput.h"
+
 #ifndef __GNUC__
 #pragma warning( push )
 #pragma warning( disable : 4250 )

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.cpp
@@ -352,7 +352,7 @@ void CWinRenderer::Update()
   ManageDisplay();
 }
 
-void CWinRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha)
+void CWinRenderer::RenderUpdate(bool clear, unsigned int flags, unsigned int alpha)
 {
   if (clear)
     g_graphicsContext.Clear(m_clearColour);
@@ -397,7 +397,7 @@ void CWinRenderer::FlipPage(int source)
   return;
 }
 
-unsigned int CWinRenderer::PreInit()
+void CWinRenderer::PreInit()
 {
   CSingleLock lock(g_graphicsContext);
   m_bConfigured = false;
@@ -440,7 +440,6 @@ unsigned int CWinRenderer::PreInit()
     m_formats.push_back(RENDER_FMT_YUYV422);
     m_formats.push_back(RENDER_FMT_UYVY422);
   }
-  return 0;
 }
 
 void CWinRenderer::UnInit()

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.h b/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.h
@@ -23,7 +23,7 @@
 #if !defined(TARGET_POSIX) && !defined(HAS_GL)
 
 #include "BaseRenderer.h"
-#include "DXVAHD.h"
+#include "HwDecRender/DXVAHD.h"
 #include "guilib/D3DResource.h"
 #include "RenderFormats.h"
 #include "RenderCapture.h"
@@ -155,22 +155,24 @@ class CWinRenderer : public CBaseRenderer
   virtual void         ReleaseImage(int source, bool preserve = false);
   virtual bool         AddVideoPicture(DVDVideoPicture* picture, int index);
   virtual void         FlipPage(int source);
-  virtual unsigned int PreInit();
+  virtual void         PreInit();
   virtual void         UnInit();
   virtual void         Reset(); /* resets renderer after seek for example */
   virtual bool         IsConfigured() { return m_bConfigured; }
   virtual void         Flush();
 
   virtual CRenderInfo GetRenderInfo();
 
+  // Feature support
+  virtual bool         SupportsMultiPassRendering() { return false; }
   virtual bool         Supports(ERENDERFEATURE feature);
   virtual bool         Supports(EDEINTERLACEMODE mode);
   virtual bool         Supports(EINTERLACEMETHOD method);
   virtual bool         Supports(ESCALINGMETHOD method);
 
   virtual EINTERLACEMETHOD AutoInterlaceMethod();
 
-  void                 RenderUpdate(bool clear, DWORD flags = 0, DWORD alpha = 255);
+  void                 RenderUpdate(bool clear, unsigned int flags = 0, unsigned int alpha = 255);
 
   virtual void         SetBufferSize(int numBuffers) { m_neededBuffers = numBuffers; }
   virtual void         ReleaseBuffer(int idx);

diff --git a/xbmc/rendering/dx/RenderSystemDX.cpp b/xbmc/rendering/dx/RenderSystemDX.cpp
@@ -498,7 +498,7 @@ void CRenderSystemDX::OnDeviceReset()
       (*i)->OnResetDevice();
   }
 
-  g_renderManager.Flush();
+  //g_renderManager.Flush();
   g_windowManager.SendMessage(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_RENDERER_RESET);
 }