From dc068334164d402bd0d8d05c70015c45c4baac7e Mon Sep 17 00:00:00 2001 From: Anton Fedchin Date: Sat, 19 Sep 2015 17:40:08 +0300 Subject: [PATCH] [win32] Fix compilation errors. --- .../VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp | 4 ++-- xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererDX.h | 4 ++-- .../VideoRenderers/VideoShaders/WinVideoFilter.cpp | 4 ++-- .../VideoRenderers/VideoShaders/YUV2RGBShader.cpp | 5 ++--- .../VideoRenderers/VideoShaders/YUV2RGBShader.h | 4 ++-- xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.cpp | 5 ++--- xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.h | 8 +++++--- xbmc/rendering/dx/RenderSystemDX.cpp | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp index 0ee44d5e7cc0e..f8435f563cf8d 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp @@ -29,7 +29,7 @@ #include #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 index 47f413c71d7a3..f5fd62bf3cacf 100644 --- 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 index 133a5937cd378..2c32d1eeba597 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp +++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp @@ -23,8 +23,8 @@ #include #include "WinVideoFilter.h" #include "windowing/WindowingFactory.h" -#include "../../../utils/log.h" -#include "../../../FileSystem/File.h" +#include "../../../../utils/log.h" +#include "../../../../FileSystem/File.h" #include #include "ConvolutionKernels.h" #include "YUV2RGBShader.h" diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/YUV2RGBShader.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/YUV2RGBShader.cpp index 43a7036e97bad..2b12f9c3920a2 100644 --- 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 index 1cdcc9467b1b0..114443a8408c0 100644 --- 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 index b999145dd9b50..e1eeece2d5586 100644 --- 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 index a134c643a7cf5..e6ae5f1f7f6ed 100644 --- 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,7 +155,7 @@ 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; } @@ -163,6 +163,8 @@ class CWinRenderer : public CBaseRenderer 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); @@ -170,7 +172,7 @@ class CWinRenderer : public CBaseRenderer 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 index 9af5a21bec513..d769a7a177dc7 100644 --- 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); }