[vlc-commits] d3d11: rename d3d_vshader_t to d3d_vertex_shader_t

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Oct 22 16:46:48 2020 +0200| [2d0c4ff9868ef2954c7ff8efdbd167811dbd9654] | committer: Steve Lhomme

d3d11: rename d3d_vshader_t to d3d_vertex_shader_t

And remove unused D3D11_SetVertexShader

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2d0c4ff9868ef2954c7ff8efdbd167811dbd9654
---

 modules/video_output/win32/d3d11_quad.c    |  2 +-
 modules/video_output/win32/d3d11_quad.h    |  2 +-
 modules/video_output/win32/d3d11_shaders.c | 16 ++++------------
 modules/video_output/win32/d3d11_shaders.h |  9 ++++-----
 modules/video_output/win32/direct3d11.c    |  4 ++--
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/modules/video_output/win32/d3d11_quad.c b/modules/video_output/win32/d3d11_quad.c
index b4fa5a010d..b90ecacad8 100644
--- a/modules/video_output/win32/d3d11_quad.c
+++ b/modules/video_output/win32/d3d11_quad.c
@@ -42,7 +42,7 @@
 #define nbLatBands SPHERE_SLICES
 #define nbLonBands SPHERE_SLICES
 
-void D3D11_RenderQuad(d3d11_device_t *d3d_dev, d3d_quad_t *quad, d3d_vshader_t *vsshader,
+void D3D11_RenderQuad(d3d11_device_t *d3d_dev, d3d_quad_t *quad, d3d_vertex_shader_t *vsshader,
                       ID3D11ShaderResourceView *resourceView[D3D11_MAX_SHADER_VIEW],
                       d3d11_select_plane_t selectPlane, void *selectOpaque)
 {
diff --git a/modules/video_output/win32/d3d11_quad.h b/modules/video_output/win32/d3d11_quad.h
index f1a573aea3..8b7e231c38 100644
--- a/modules/video_output/win32/d3d11_quad.h
+++ b/modules/video_output/win32/d3d11_quad.h
@@ -47,7 +47,7 @@ typedef struct d3d_vertex_t {
 
 typedef bool (*d3d11_select_plane_t)(void *opaque, size_t plane_index);
 
-void D3D11_RenderQuad(d3d11_device_t *, d3d_quad_t *, d3d_vshader_t *,
+void D3D11_RenderQuad(d3d11_device_t *, d3d_quad_t *, d3d_vertex_shader_t *,
                       ID3D11ShaderResourceView *resourceViews[D3D11_MAX_SHADER_VIEW],
                       d3d11_select_plane_t selectPlane, void *selectOpaque);
 
diff --git a/modules/video_output/win32/d3d11_shaders.c b/modules/video_output/win32/d3d11_shaders.c
index 06e366f299..2ead8498bd 100644
--- a/modules/video_output/win32/d3d11_shaders.c
+++ b/modules/video_output/win32/d3d11_shaders.c
@@ -788,7 +788,7 @@ void D3D11_ClearRenderTargets(d3d11_device_t *d3d_dev, const d3d_format_t *cfg,
 
 static HRESULT D3D11_CompileVertexShader(vlc_object_t *obj, const d3d11_shader_compiler_t *compiler,
                                          d3d11_device_t *d3d_dev, const char *psz_shader,
-                                         d3d_vshader_t *output)
+                                         d3d_vertex_shader_t *output)
 {
    HRESULT hr = E_FAIL;
    ID3DBlob *pVSBlob = D3D11_CompileShader(obj, compiler, d3d_dev, psz_shader, false);
@@ -823,15 +823,7 @@ error:
    return hr;
 }
 
-void D3D11_SetVertexShader(d3d_vshader_t *dst, d3d_vshader_t *src)
-{
-    dst->layout = src->layout;
-    ID3D11InputLayout_AddRef(dst->layout);
-    dst->shader = src->shader;
-    ID3D11VertexShader_AddRef(dst->shader);
-}
-
-void D3D11_ReleaseVertexShader(d3d_vshader_t *shader)
+void D3D11_ReleaseVertexShader(d3d_vertex_shader_t *shader)
 {
     if (shader->layout)
     {
@@ -846,13 +838,13 @@ void D3D11_ReleaseVertexShader(d3d_vshader_t *shader)
 }
 
 HRESULT (D3D11_CompileFlatVertexShader)(vlc_object_t *obj, const d3d11_shader_compiler_t *compiler,
-                                      d3d11_device_t *d3d_dev, d3d_vshader_t *output)
+                                      d3d11_device_t *d3d_dev, d3d_vertex_shader_t *output)
 {
     return D3D11_CompileVertexShader(obj, compiler, d3d_dev, globVertexShaderFlat, output);
 }
 
 HRESULT (D3D11_CompileProjectionVertexShader)(vlc_object_t *obj, const d3d11_shader_compiler_t *compiler,
-                                            d3d11_device_t *d3d_dev, d3d_vshader_t *output)
+                                            d3d11_device_t *d3d_dev, d3d_vertex_shader_t *output)
 {
     return D3D11_CompileVertexShader(obj, compiler, d3d_dev, globVertexShaderProjection, output);
 }
diff --git a/modules/video_output/win32/d3d11_shaders.h b/modules/video_output/win32/d3d11_shaders.h
index 7820c8bcee..bbcc8d3e9a 100644
--- a/modules/video_output/win32/d3d11_shaders.h
+++ b/modules/video_output/win32/d3d11_shaders.h
@@ -75,7 +75,7 @@ extern const char* globVertexShaderProjection;
 typedef struct {
     ID3D11VertexShader        *shader;
     ID3D11InputLayout         *layout;
-} d3d_vshader_t;
+} d3d_vertex_shader_t;
 
 /* A Quad is texture that can be displayed in a rectangle */
 typedef struct
@@ -118,10 +118,10 @@ HRESULT D3D11_CompilePixelShader(vlc_object_t *, const d3d11_shader_compiler_t *
     D3D11_CompilePixelShader(VLC_OBJECT(a),b,c,d,e,f,g,h,i)
 void D3D11_ReleasePixelShader(d3d_quad_t *);
 
-HRESULT D3D11_CompileFlatVertexShader(vlc_object_t *, const d3d11_shader_compiler_t *, d3d11_device_t *, d3d_vshader_t *);
+HRESULT D3D11_CompileFlatVertexShader(vlc_object_t *, const d3d11_shader_compiler_t *, d3d11_device_t *, d3d_vertex_shader_t *);
 #define D3D11_CompileFlatVertexShader(a,b,c,d) D3D11_CompileFlatVertexShader(VLC_OBJECT(a),b,c,d)
 
-HRESULT D3D11_CompileProjectionVertexShader(vlc_object_t *, const d3d11_shader_compiler_t *, d3d11_device_t *, d3d_vshader_t *);
+HRESULT D3D11_CompileProjectionVertexShader(vlc_object_t *, const d3d11_shader_compiler_t *, d3d11_device_t *, d3d_vertex_shader_t *);
 #define D3D11_CompileProjectionVertexShader(a,b,c,d) D3D11_CompileProjectionVertexShader(VLC_OBJECT(a),b,c,d)
 
 float GetFormatLuminance(vlc_object_t *, const video_format_t *);
@@ -133,7 +133,6 @@ HRESULT D3D11_CreateRenderTargets(d3d11_device_t *, ID3D11Resource *, const d3d_
 void D3D11_ClearRenderTargets(d3d11_device_t *, const d3d_format_t *,
                               ID3D11RenderTargetView *targets[D3D11_MAX_RENDER_TARGET]);
 
-void D3D11_SetVertexShader(d3d_vshader_t *dst, d3d_vshader_t *src);
-void D3D11_ReleaseVertexShader(d3d_vshader_t *);
+void D3D11_ReleaseVertexShader(d3d_vertex_shader_t *);
 
 #endif /* VLC_D3D11_SHADERS_H */
diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index 9587a54870..20b5767c3a 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -105,8 +105,8 @@ struct vout_display_sys_t
     picture_sys_d3d11_t      stagingSys;
     plane_t                  stagingPlanes[PICTURE_PLANE_MAX];
 
-    d3d_vshader_t            projectionVShader;
-    d3d_vshader_t            flatVShader;
+    d3d_vertex_shader_t      projectionVShader;
+    d3d_vertex_shader_t      flatVShader;
 
     /* copy from the decoder pool into picSquad before display
      * Uses a Texture2D with slices rather than a Texture2DArray for the decoder */