[vlc-commits] direct3d11: rename AcquirePictureSys / ReleasePictureSys
Steve Lhomme
git at videolan.org
Thu Jun 6 12:09:21 CEST 2019
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Jun 6 11:05:19 2019 +0200| [852823d4b4286d50dd3d0a1bbd7dacbb697619f8] | committer: Steve Lhomme
direct3d11: rename AcquirePictureSys / ReleasePictureSys
So they are not fixed with D3D9 calls.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=852823d4b4286d50dd3d0a1bbd7dacbb697619f8
---
modules/codec/avcodec/d3d11va.c | 6 +++---
modules/hw/d3d11/d3d11_deinterlace.c | 6 +++---
modules/hw/d3d11/d3d11_surface.c | 8 ++++----
modules/video_chroma/d3d11_fmt.c | 4 ++--
modules/video_chroma/d3d11_fmt.h | 4 ++--
modules/video_output/win32/d3d11_quad.c | 2 +-
modules/video_output/win32/direct3d11.c | 4 ++--
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
index 39e2221eaa..445cb3b10c 100644
--- a/modules/codec/avcodec/d3d11va.c
+++ b/modules/codec/avcodec/d3d11va.c
@@ -161,7 +161,7 @@ static void d3d11_pic_context_destroy(struct picture_context_t *opaque)
struct va_pic_context *pic_ctx = (struct va_pic_context*)opaque;
if (pic_ctx->va_surface)
va_surface_Release(pic_ctx->va_surface);
- ReleasePictureSys(&pic_ctx->picsys);
+ ReleaseD3D11PictureSys(&pic_ctx->picsys);
free(pic_ctx);
}
@@ -211,7 +211,7 @@ static struct va_pic_context *CreatePicContext(
pic_ctx->picsys.resource[i] = p_resource;
pic_ctx->picsys.renderSrc[i] = renderSrc[i];
}
- AcquirePictureSys(&pic_ctx->picsys);
+ AcquireD3D11PictureSys(&pic_ctx->picsys);
pic_ctx->picsys.context = context;
done:
return pic_ctx;
@@ -244,7 +244,7 @@ static struct va_pic_context* NewSurfacePicContext(vlc_va_t *va, int surface_ind
/* all the resources are acquired during surfaces init, and a second time in
* CreatePicContext(), undo one of them otherwise we need an extra release
* when the pool is emptied */
- ReleasePictureSys(&pic_ctx->picsys);
+ ReleaseD3D11PictureSys(&pic_ctx->picsys);
return pic_ctx;
}
diff --git a/modules/hw/d3d11/d3d11_deinterlace.c b/modules/hw/d3d11/d3d11_deinterlace.c
index 0312c4bae9..7d4b2b90e1 100644
--- a/modules/hw/d3d11/d3d11_deinterlace.c
+++ b/modules/hw/d3d11/d3d11_deinterlace.c
@@ -213,7 +213,7 @@ static const struct filter_mode_t *GetFilterMode(const char *mode)
static void d3d11_pic_context_destroy(struct picture_context_t *opaque)
{
struct va_pic_context *pic_ctx = (struct va_pic_context*)opaque;
- ReleasePictureSys(&pic_ctx->picsys);
+ ReleaseD3D11PictureSys(&pic_ctx->picsys);
free(pic_ctx);
}
@@ -226,7 +226,7 @@ static struct picture_context_t *d3d11_pic_context_copy(struct picture_context_t
pic_ctx->s.destroy = d3d11_pic_context_destroy;
pic_ctx->s.copy = d3d11_pic_context_copy;
pic_ctx->picsys = src_ctx->picsys;
- AcquirePictureSys(&pic_ctx->picsys);
+ AcquireD3D11PictureSys(&pic_ctx->picsys);
return &pic_ctx->s;
}
@@ -289,7 +289,7 @@ picture_t *AllocPicture( filter_t *p_filter )
pic_ctx->s.destroy = d3d11_pic_context_destroy;
pic_ctx->s.copy = d3d11_pic_context_copy;
pic_ctx->picsys = *pic_sys;
- AcquirePictureSys( &pic_ctx->picsys );
+ AcquireD3D11PictureSys( &pic_ctx->picsys );
pic->context = &pic_ctx->s;
}
if (b_local_texture) {
diff --git a/modules/hw/d3d11/d3d11_surface.c b/modules/hw/d3d11/d3d11_surface.c
index 6db062ef17..730bf09154 100644
--- a/modules/hw/d3d11/d3d11_surface.c
+++ b/modules/hw/d3d11/d3d11_surface.c
@@ -499,7 +499,7 @@ static void D3D11_RGBA(filter_t *p_filter, picture_t *src, picture_t *dst)
static void DestroyPicture(picture_t *picture)
{
picture_sys_t *p_sys = picture->p_sys;
- ReleasePictureSys( p_sys );
+ ReleaseD3D11PictureSys( p_sys );
free(p_sys);
}
@@ -553,7 +553,7 @@ static filter_t *CreateFilter( vlc_object_t *p_this, const es_format_t *p_fmt_in
static void d3d11_pic_context_destroy(struct picture_context_t *opaque)
{
struct va_pic_context *pic_ctx = (struct va_pic_context*)opaque;
- ReleasePictureSys(&pic_ctx->picsys);
+ ReleaseD3D11PictureSys(&pic_ctx->picsys);
free(pic_ctx);
}
@@ -566,7 +566,7 @@ static struct picture_context_t *d3d11_pic_context_copy(struct picture_context_t
pic_ctx->s.destroy = d3d11_pic_context_destroy;
pic_ctx->s.copy = d3d11_pic_context_copy;
pic_ctx->picsys = src_ctx->picsys;
- AcquirePictureSys(&pic_ctx->picsys);
+ AcquireD3D11PictureSys(&pic_ctx->picsys);
return &pic_ctx->s;
}
@@ -618,7 +618,7 @@ static void NV12_D3D11(filter_t *p_filter, picture_t *src, picture_t *dst)
pic_ctx->s.destroy = d3d11_pic_context_destroy;
pic_ctx->s.copy = d3d11_pic_context_copy;
pic_ctx->picsys = *p_sys;
- AcquirePictureSys(&pic_ctx->picsys);
+ AcquireD3D11PictureSys(&pic_ctx->picsys);
dst->context = &pic_ctx->s;
}
}
diff --git a/modules/video_chroma/d3d11_fmt.c b/modules/video_chroma/d3d11_fmt.c
index 10514fdd5a..e1f60cd49e 100644
--- a/modules/video_chroma/d3d11_fmt.c
+++ b/modules/video_chroma/d3d11_fmt.c
@@ -40,7 +40,7 @@
#include "../codec/avcodec/va_surface.h"
-void AcquirePictureSys(picture_sys_t *p_sys)
+void AcquireD3D11PictureSys(picture_sys_t *p_sys)
{
for (int i=0; i<D3D11_MAX_SHADER_VIEW; i++) {
if (p_sys->renderSrc[i])
@@ -58,7 +58,7 @@ void AcquirePictureSys(picture_sys_t *p_sys)
ID3D11VideoProcessorOutputView_AddRef(p_sys->processorOutput);
}
-void ReleasePictureSys(picture_sys_t *p_sys)
+void ReleaseD3D11PictureSys(picture_sys_t *p_sys)
{
for (int i=0; i<D3D11_MAX_SHADER_VIEW; i++) {
if (p_sys->renderSrc[i])
diff --git a/modules/video_chroma/d3d11_fmt.h b/modules/video_chroma/d3d11_fmt.h
index fb7c36a39e..bb1f7b72a8 100644
--- a/modules/video_chroma/d3d11_fmt.h
+++ b/modules/video_chroma/d3d11_fmt.h
@@ -86,9 +86,9 @@ static inline bool is_d3d11_opaque(vlc_fourcc_t chroma)
chroma == VLC_CODEC_D3D11_OPAQUE_BGRA;
}
-void AcquirePictureSys(picture_sys_t *p_sys);
+void AcquireD3D11PictureSys(picture_sys_t *p_sys);
-void ReleasePictureSys(picture_sys_t *p_sys);
+void ReleaseD3D11PictureSys(picture_sys_t *p_sys);
/* map texture planes to resource views */
int D3D11_AllocateResourceView(vlc_object_t *obj, ID3D11Device *d3ddevice,
diff --git a/modules/video_output/win32/d3d11_quad.c b/modules/video_output/win32/d3d11_quad.c
index 23406b1aaf..8a0e367929 100644
--- a/modules/video_output/win32/d3d11_quad.c
+++ b/modules/video_output/win32/d3d11_quad.c
@@ -192,7 +192,7 @@ void D3D11_ReleaseQuad(d3d_quad_t *quad)
quad->d3dsampState[i] = NULL;
}
}
- ReleasePictureSys(&quad->picSys);
+ ReleaseD3D11PictureSys(&quad->picSys);
}
/**
diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index ce73fe2f59..f60c65f9e3 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -497,7 +497,7 @@ error:
static void DestroyDisplayPoolPicture(picture_t *picture)
{
picture_sys_t *p_sys = picture->p_sys;
- ReleasePictureSys( p_sys );
+ ReleaseD3D11PictureSys( p_sys );
free(p_sys);
}
@@ -1307,7 +1307,7 @@ static void Direct3D11DestroyResources(vout_display_t *vd)
Direct3D11DeleteRegions(sys->d3dregion_count, sys->d3dregions);
sys->d3dregion_count = 0;
- ReleasePictureSys(&sys->stagingSys);
+ ReleaseD3D11PictureSys(&sys->stagingSys);
D3D11_ReleaseVertexShader(&sys->flatVShader);
D3D11_ReleaseVertexShader(&sys->projectionVShader);
More information about the vlc-commits
mailing list