[vlc-commits] dxgi_fmt: rename GetRenderFormatList to DxgiGetRenderFormatList
Steve Lhomme
git at videolan.org
Wed Feb 10 11:06:56 UTC 2021
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jan 25 08:35:17 2021 +0100| [104e9bbdd45ca921f5fd46dd83015894c18f8892] | committer: Steve Lhomme
dxgi_fmt: rename GetRenderFormatList to DxgiGetRenderFormatList
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=104e9bbdd45ca921f5fd46dd83015894c18f8892
---
modules/codec/avcodec/d3d11va.c | 2 +-
modules/hw/d3d11/d3d11_deinterlace.c | 2 +-
modules/hw/d3d11/d3d11_filters.c | 2 +-
modules/hw/d3d11/d3d11_surface.c | 2 +-
modules/video_chroma/d3d11_fmt.c | 2 +-
modules/video_chroma/dxgi_fmt.c | 2 +-
modules/video_chroma/dxgi_fmt.h | 2 +-
modules/video_output/win32/d3d11_swapchain.c | 2 +-
modules/video_output/win32/direct3d11.c | 4 ++--
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
index a2424b41e2..753aaca986 100644
--- a/modules/codec/avcodec/d3d11va.c
+++ b/modules/codec/avcodec/d3d11va.c
@@ -366,7 +366,7 @@ static int DxGetInputList(vlc_va_t *va, input_list_t *p_list)
static const d3d_format_t *D3D11_FindDXGIFormat(DXGI_FORMAT dxgi)
{
- for (const d3d_format_t *output_format = GetRenderFormatList();
+ for (const d3d_format_t *output_format = DxgiGetRenderFormatList();
output_format->name != NULL; ++output_format)
{
if (output_format->formatTexture == dxgi &&
diff --git a/modules/hw/d3d11/d3d11_deinterlace.c b/modules/hw/d3d11/d3d11_deinterlace.c
index fafb4fd84b..312c9bfe96 100644
--- a/modules/hw/d3d11/d3d11_deinterlace.c
+++ b/modules/hw/d3d11/d3d11_deinterlace.c
@@ -254,7 +254,7 @@ int D3D11OpenDeinterlace(filter_t *filter)
d3d11_decoder_device_t *dev_sys = GetD3D11OpaqueContext( filter->vctx_in );
sys->d3d_dev = &dev_sys->d3d_dev;
- for (const d3d_format_t *output_format = GetRenderFormatList();
+ for (const d3d_format_t *output_format = DxgiGetRenderFormatList();
output_format->name != NULL; ++output_format)
{
if (output_format->formatTexture == vctx_sys->format &&
diff --git a/modules/hw/d3d11/d3d11_filters.c b/modules/hw/d3d11/d3d11_filters.c
index f8a0300ab7..1031b56cc1 100644
--- a/modules/hw/d3d11/d3d11_filters.c
+++ b/modules/hw/d3d11/d3d11_filters.c
@@ -195,7 +195,7 @@ static picture_t *AllocPicture( filter_t *p_filter )
d3d11_video_context_t *vctx_sys = GetD3D11ContextPrivate( p_filter->vctx_out );
const d3d_format_t *cfg = NULL;
- for (const d3d_format_t *output_format = GetRenderFormatList();
+ for (const d3d_format_t *output_format = DxgiGetRenderFormatList();
output_format->name != NULL; ++output_format)
{
if (output_format->formatTexture == vctx_sys->format &&
diff --git a/modules/hw/d3d11/d3d11_surface.c b/modules/hw/d3d11/d3d11_surface.c
index e561853e03..1f53d74230 100644
--- a/modules/hw/d3d11/d3d11_surface.c
+++ b/modules/hw/d3d11/d3d11_surface.c
@@ -615,7 +615,7 @@ static picture_t *AllocateCPUtoGPUTexture(filter_t *p_filter, filter_sys_t *p_sy
d3d11_video_context_t *vctx_sys = GetD3D11ContextPrivate( p_filter->vctx_out );
const d3d_format_t *cfg = NULL;
- for (const d3d_format_t *output_format = GetRenderFormatList();
+ for (const d3d_format_t *output_format = DxgiGetRenderFormatList();
output_format->name != NULL; ++output_format)
{
if (output_format->formatTexture == vctx_sys->format &&
diff --git a/modules/video_chroma/d3d11_fmt.c b/modules/video_chroma/d3d11_fmt.c
index e5a66e14e9..2cf12f2c21 100644
--- a/modules/video_chroma/d3d11_fmt.c
+++ b/modules/video_chroma/d3d11_fmt.c
@@ -703,7 +703,7 @@ const d3d_format_t *(FindD3D11Format)(vlc_object_t *o,
UINT supportFlags)
{
supportFlags |= D3D11_FORMAT_SUPPORT_TEXTURE2D;
- for (const d3d_format_t *output_format = GetRenderFormatList();
+ for (const d3d_format_t *output_format = DxgiGetRenderFormatList();
output_format->name != NULL; ++output_format)
{
if (i_src_chroma && i_src_chroma != output_format->fourcc)
diff --git a/modules/video_chroma/dxgi_fmt.c b/modules/video_chroma/dxgi_fmt.c
index 7d6fa2cdc6..643dece81e 100644
--- a/modules/video_chroma/dxgi_fmt.c
+++ b/modules/video_chroma/dxgi_fmt.c
@@ -130,7 +130,7 @@ DXGI_FORMAT DxgiFourccFormat(vlc_fourcc_t fcc)
return DXGI_FORMAT_UNKNOWN;
}
-const d3d_format_t *GetRenderFormatList(void)
+const d3d_format_t *DxgiGetRenderFormatList(void)
{
return d3d_formats;
}
diff --git a/modules/video_chroma/dxgi_fmt.h b/modules/video_chroma/dxgi_fmt.h
index 9cd0e9b3f4..f104614d9f 100644
--- a/modules/video_chroma/dxgi_fmt.h
+++ b/modules/video_chroma/dxgi_fmt.h
@@ -52,7 +52,7 @@ typedef struct
const char *DxgiFormatToStr(DXGI_FORMAT format);
vlc_fourcc_t DxgiFormatFourcc(DXGI_FORMAT format);
-const d3d_format_t *GetRenderFormatList(void);
+const d3d_format_t *DxgiGetRenderFormatList(void);
void DxgiFormatMask(DXGI_FORMAT format, video_format_t *);
DXGI_FORMAT DxgiFourccFormat(vlc_fourcc_t fcc);
const char *DxgiVendorStr(unsigned int gpu_vendor);
diff --git a/modules/video_output/win32/d3d11_swapchain.c b/modules/video_output/win32/d3d11_swapchain.c
index 21e042b254..c4bb5015f8 100644
--- a/modules/video_output/win32/d3d11_swapchain.c
+++ b/modules/video_output/win32/d3d11_swapchain.c
@@ -106,7 +106,7 @@ static bool UpdateSwapchain( struct d3d11_local_swapchain *display, const libvlc
DXGI_SWAP_CHAIN_DESC1 scd;
if (SUCCEEDED(IDXGISwapChain1_GetDesc1(dxgiswapChain, &scd)))
{
- for (const d3d_format_t *output_format = GetRenderFormatList();
+ for (const d3d_format_t *output_format = DxgiGetRenderFormatList();
output_format->name != NULL; ++output_format)
{
if (output_format->formatTexture == scd.Format &&
diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index a01f77881f..912afae420 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -205,7 +205,7 @@ static int UpdateDisplayFormat(vout_display_t *vd, const video_format_t *fmt)
display_info_t new_display = { 0 };
- for (const d3d_format_t *output_format = GetRenderFormatList();
+ for (const d3d_format_t *output_format = DxgiGetRenderFormatList();
output_format->name != NULL; ++output_format)
{
if (output_format->formatTexture == (DXGI_FORMAT)out.dxgi_format &&
@@ -839,7 +839,7 @@ static int SetupOutputFormat(vout_display_t *vd, video_format_t *fmt, vlc_video_
if (vtcx_sys != NULL &&
DeviceSupportsFormat( vd->sys->d3d_dev->d3ddevice, vtcx_sys->format, D3D11_FORMAT_SUPPORT_SHADER_LOAD ))
{
- for (const d3d_format_t *output_format = GetRenderFormatList();
+ for (const d3d_format_t *output_format = DxgiGetRenderFormatList();
output_format->name != NULL; ++output_format)
{
if (output_format->formatTexture == vtcx_sys->format &&
More information about the vlc-commits
mailing list