videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-28 23:09:59 +02:00
Code Releases Activity

dxgi_fmt: rename some defines/constants from D3D11_ to DXGI_

Browse Source 
Move some defines from d3d11_fmt.h to dxgi_fmt.h.
This commit is contained in:
Steve Lhomme 2021-01-25 08:42:52 +01:00
parent 104e9bbdd4
commit ed6e9b9a9f
7 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/codec/avcodec/d3d11va.c
View File

@ -403,18 +403,18 @@ static int DxSetupOutput(vlc_va_t *va, const directx_va_mode_t *mode, const vide
int idx = 0;
const d3d_format_t *decoder_format;
UINT supportFlags = D3D11_FORMAT_SUPPORT_DECODER_OUTPUT | D3D11_FORMAT_SUPPORT_SHADER_LOAD;
decoder_format = FindD3D11Format( va, va->sys->d3d_dev, 0, D3D11_RGB_FORMAT|D3D11_YUV_FORMAT,
decoder_format = FindD3D11Format( va, va->sys->d3d_dev, 0, DXGI_RGB_FORMAT|DXGI_YUV_FORMAT,
mode->bit_depth, mode->log2_chroma_h+1, mode->log2_chroma_w+1,
D3D11_CHROMA_GPU, supportFlags );
DXGI_CHROMA_GPU, supportFlags );
if (decoder_format == NULL)
decoder_format = FindD3D11Format( va, va->sys->d3d_dev, 0, D3D11_RGB_FORMAT|D3D11_YUV_FORMAT,
mode->bit_depth, 0, 0, D3D11_CHROMA_GPU, supportFlags );
decoder_format = FindD3D11Format( va, va->sys->d3d_dev, 0, DXGI_RGB_FORMAT|DXGI_YUV_FORMAT,
mode->bit_depth, 0, 0, DXGI_CHROMA_GPU, supportFlags );
if (decoder_format == NULL && mode->bit_depth > 10)
decoder_format = FindD3D11Format( va, va->sys->d3d_dev, 0, D3D11_RGB_FORMAT|D3D11_YUV_FORMAT,
10, 0, 0, D3D11_CHROMA_GPU, supportFlags );
decoder_format = FindD3D11Format( va, va->sys->d3d_dev, 0, DXGI_RGB_FORMAT|DXGI_YUV_FORMAT,
10, 0, 0, DXGI_CHROMA_GPU, supportFlags );
if (decoder_format == NULL)
decoder_format = FindD3D11Format( va, va->sys->d3d_dev, 0, D3D11_RGB_FORMAT|D3D11_YUV_FORMAT,
0, 0, 0, D3D11_CHROMA_GPU, supportFlags );
decoder_format = FindD3D11Format( va, va->sys->d3d_dev, 0, DXGI_RGB_FORMAT|DXGI_YUV_FORMAT,
0, 0, 0, DXGI_CHROMA_GPU, supportFlags );
if (decoder_format != NULL)
{
msg_Dbg(va, "favor decoder format %s", decoder_format->name);

2
modules/hw/d3d11/d3d11_surface.c
View File

@ -183,7 +183,7 @@ static int assert_staging(filter_t *p_filter, filter_sys_t *sys, DXGI_FORMAT for
/* failed with the this format, try a different one */
UINT supportFlags = D3D11_FORMAT_SUPPORT_SHADER_LOAD | D3D11_FORMAT_SUPPORT_VIDEO_PROCESSOR_OUTPUT;
const d3d_format_t *new_fmt =
FindD3D11Format( p_filter, d3d_dev, 0, D3D11_RGB_FORMAT|D3D11_YUV_FORMAT, 0, 0, 0, D3D11_CHROMA_CPU, supportFlags );
FindD3D11Format( p_filter, d3d_dev, 0, DXGI_RGB_FORMAT|DXGI_YUV_FORMAT, 0, 0, 0, DXGI_CHROMA_CPU, supportFlags );
if (new_fmt && texDesc.Format != new_fmt->formatTexture)
{
DXGI_FORMAT srcFormat = texDesc.Format;

4
modules/video_chroma/d3d11_fmt.c
View File

@ -710,10 +710,10 @@ const d3d_format_t *(FindD3D11Format)(vlc_object_t *o,
continue;
if (bits_per_channel && bits_per_channel > output_format->bitsPerChannel)
continue;
int cpu_gpu_fmt = is_d3d11_opaque(output_format->fourcc) ? D3D11_CHROMA_GPU : D3D11_CHROMA_CPU;
int cpu_gpu_fmt = is_d3d11_opaque(output_format->fourcc) ? DXGI_CHROMA_GPU : DXGI_CHROMA_CPU;
if ((cpu_gpu & cpu_gpu_fmt)==0)
continue;
int format = vlc_fourcc_IsYUV(output_format->fourcc) ? D3D11_YUV_FORMAT : D3D11_RGB_FORMAT;
int format = vlc_fourcc_IsYUV(output_format->fourcc) ? DXGI_YUV_FORMAT : DXGI_RGB_FORMAT;
if ((rgb_yuv & format)==0)
continue;
if (widthDenominator && widthDenominator < output_format->widthDenominator)

6
modules/video_chroma/d3d11_fmt.h
View File

@ -151,12 +151,6 @@ int D3D11CheckDriverVersion(const d3d11_device_t *, UINT vendorId,
bool DeviceSupportsFormat(ID3D11Device *d3ddevice, DXGI_FORMAT format, UINT supportFlags);
#define D3D11_RGB_FORMAT 1
#define D3D11_YUV_FORMAT 2
#define D3D11_CHROMA_CPU 1
#define D3D11_CHROMA_GPU 2
const d3d_format_t *FindD3D11Format(vlc_object_t *,
d3d11_device_t*,
vlc_fourcc_t i_src_chroma,

6
modules/video_chroma/dxgi_fmt.h
View File

@ -60,4 +60,10 @@ UINT DxgiResourceCount(const d3d_format_t *);
bool DxgiIsRGBFormat(const d3d_format_t *);
#define DXGI_RGB_FORMAT 1
#define DXGI_YUV_FORMAT 2
#define DXGI_CHROMA_CPU 1
#define DXGI_CHROMA_GPU 2
#endif /* include-guard */

8
modules/video_output/win32/d3d11_swapchain.c
View File

@ -120,15 +120,15 @@ static bool UpdateSwapchain( struct d3d11_local_swapchain *display, const libvlc
}
#else /* !VLC_WINSTORE_APP */
/* favor RGB formats first */
newPixelFormat = FindD3D11Format( display->obj, display->d3d_dev, 0, D3D11_RGB_FORMAT,
newPixelFormat = FindD3D11Format( display->obj, display->d3d_dev, 0, DXGI_RGB_FORMAT,
cfg->bitdepth > 8 ? 10 : 8,
0, 0,
D3D11_CHROMA_CPU, D3D11_FORMAT_SUPPORT_DISPLAY );
DXGI_CHROMA_CPU, D3D11_FORMAT_SUPPORT_DISPLAY );
if (unlikely(newPixelFormat == NULL))
newPixelFormat = FindD3D11Format( display->obj, display->d3d_dev, 0, D3D11_YUV_FORMAT,
newPixelFormat = FindD3D11Format( display->obj, display->d3d_dev, 0, DXGI_YUV_FORMAT,
cfg->bitdepth > 8 ? 10 : 8,
0, 0,
D3D11_CHROMA_CPU, D3D11_FORMAT_SUPPORT_DISPLAY );
DXGI_CHROMA_CPU, D3D11_FORMAT_SUPPORT_DISPLAY );
#endif /* !VLC_WINSTORE_APP */
if (unlikely(newPixelFormat == NULL)) {
msg_Err(display->obj, "Could not get the SwapChain format.");

16
modules/video_output/win32/direct3d11.c
View File

@ -735,15 +735,15 @@ static const d3d_format_t *GetDirectRenderingFormat(vout_display_t *vd, vlc_four
UINT supportFlags = D3D11_FORMAT_SUPPORT_SHADER_LOAD;
if (is_d3d11_opaque(i_src_chroma))
supportFlags |= D3D11_FORMAT_SUPPORT_DECODER_OUTPUT;
return FindD3D11Format( vd, vd->sys->d3d_dev, i_src_chroma, D3D11_RGB_FORMAT|D3D11_YUV_FORMAT, 0, 0, 0,
is_d3d11_opaque(i_src_chroma) ? D3D11_CHROMA_GPU : D3D11_CHROMA_CPU, supportFlags );
return FindD3D11Format( vd, vd->sys->d3d_dev, i_src_chroma, DXGI_RGB_FORMAT|DXGI_YUV_FORMAT, 0, 0, 0,
is_d3d11_opaque(i_src_chroma) ? DXGI_CHROMA_GPU : DXGI_CHROMA_CPU, supportFlags );
}
static const d3d_format_t *GetDirectDecoderFormat(vout_display_t *vd, vlc_fourcc_t i_src_chroma)
{
UINT supportFlags = D3D11_FORMAT_SUPPORT_DECODER_OUTPUT;
return FindD3D11Format( vd, vd->sys->d3d_dev, i_src_chroma, D3D11_RGB_FORMAT|D3D11_YUV_FORMAT, 0, 0, 0,
D3D11_CHROMA_GPU, supportFlags );
return FindD3D11Format( vd, vd->sys->d3d_dev, i_src_chroma, DXGI_RGB_FORMAT|DXGI_YUV_FORMAT, 0, 0, 0,
DXGI_CHROMA_GPU, supportFlags );
}
static const d3d_format_t *GetDisplayFormatByDepth(vout_display_t *vd, uint8_t bit_depth,
@ -757,13 +757,13 @@ static const d3d_format_t *GetDisplayFormatByDepth(vout_display_t *vd, uint8_t b
supportFlags |= D3D11_FORMAT_SUPPORT_VIDEO_PROCESSOR_OUTPUT;
return FindD3D11Format( vd, vd->sys->d3d_dev, 0, rgb_yuv,
bit_depth, widthDenominator+1, heightDenominator+1,
D3D11_CHROMA_CPU, supportFlags );
DXGI_CHROMA_CPU, supportFlags );
}
static const d3d_format_t *GetBlendableFormat(vout_display_t *vd, vlc_fourcc_t i_src_chroma)
{
UINT supportFlags = D3D11_FORMAT_SUPPORT_SHADER_LOAD | D3D11_FORMAT_SUPPORT_BLENDABLE;
return FindD3D11Format( vd, vd->sys->d3d_dev, i_src_chroma, D3D11_RGB_FORMAT|D3D11_YUV_FORMAT, 0, 0, 0, D3D11_CHROMA_CPU, supportFlags );
return FindD3D11Format( vd, vd->sys->d3d_dev, i_src_chroma, DXGI_RGB_FORMAT|DXGI_YUV_FORMAT, 0, 0, 0, DXGI_CHROMA_CPU, supportFlags );
}
static int Direct3D11Open(vout_display_t *vd, video_format_t *fmtp, vlc_video_context *vctx)
@ -925,12 +925,12 @@ static int SetupOutputFormat(vout_display_t *vd, video_format_t *fmt, vlc_video_
sys->picQuad.generic.textureFormat = GetDisplayFormatByDepth(vd, bits_per_channel,
widthDenominator, heightDenominator,
decoder_format!=NULL,
is_rgb ? D3D11_RGB_FORMAT : D3D11_YUV_FORMAT);
is_rgb ? DXGI_RGB_FORMAT : DXGI_YUV_FORMAT);
if (!sys->picQuad.generic.textureFormat)
sys->picQuad.generic.textureFormat = GetDisplayFormatByDepth(vd, bits_per_channel,
widthDenominator, heightDenominator,
decoder_format!=NULL,
is_rgb ? D3D11_YUV_FORMAT : D3D11_RGB_FORMAT);
is_rgb ? DXGI_YUV_FORMAT : DXGI_RGB_FORMAT);
}
// look for any pixel format that we can handle