vlc | branch: master | Steve Lhomme <[email protected]> | Mon Jan 25 07:44:49 2021 +0100| [570dc0eb683ff6e753c17907f4dea46eaeeca1f2] | committer: Steve Lhomme
vout:d3d11: rename d3d_vertex_shader_t to d3d11_vertex_shader_t It contains d3d11 specific parts. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=570dc0eb683ff6e753c17907f4dea46eaeeca1f2 --- modules/video_output/win32/d3d11_quad.c | 2 +- modules/video_output/win32/d3d11_quad.h | 2 +- modules/video_output/win32/d3d11_shaders.c | 8 ++++---- modules/video_output/win32/d3d11_shaders.h | 8 ++++---- modules/video_output/win32/direct3d11.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/video_output/win32/d3d11_quad.c b/modules/video_output/win32/d3d11_quad.c index 58db842095..ac4d880285 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, d3d11_quad_t *quad, d3d_vertex_shader_t *vsshader, +void D3D11_RenderQuad(d3d11_device_t *d3d_dev, d3d11_quad_t *quad, d3d11_vertex_shader_t *vsshader, ID3D11ShaderResourceView *resourceView[DXGI_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 67c52abb6b..1526ed4327 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 *, d3d11_quad_t *, d3d_vertex_shader_t *, +void D3D11_RenderQuad(d3d11_device_t *, d3d11_quad_t *, d3d11_vertex_shader_t *, ID3D11ShaderResourceView *resourceViews[DXGI_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 2328342434..bd052e39a8 100644 --- a/modules/video_output/win32/d3d11_shaders.c +++ b/modules/video_output/win32/d3d11_shaders.c @@ -780,7 +780,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_vertex_shader_t *output) + d3d11_vertex_shader_t *output) { HRESULT hr = E_FAIL; ID3DBlob *pVSBlob = D3D11_CompileShader(obj, compiler, d3d_dev, psz_shader, false); @@ -815,7 +815,7 @@ error: return hr; } -void D3D11_ReleaseVertexShader(d3d_vertex_shader_t *shader) +void D3D11_ReleaseVertexShader(d3d11_vertex_shader_t *shader) { if (shader->layout) { @@ -830,13 +830,13 @@ void D3D11_ReleaseVertexShader(d3d_vertex_shader_t *shader) } HRESULT (D3D11_CompileFlatVertexShader)(vlc_object_t *obj, const d3d11_shader_compiler_t *compiler, - d3d11_device_t *d3d_dev, d3d_vertex_shader_t *output) + d3d11_device_t *d3d_dev, d3d11_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_vertex_shader_t *output) + d3d11_device_t *d3d_dev, d3d11_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 1a945942c2..b509e972c1 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_vertex_shader_t; +} d3d11_vertex_shader_t; /* A Quad is texture that can be displayed in a rectangle */ typedef struct @@ -117,10 +117,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,j,k) void D3D11_ReleasePixelShader(d3d11_quad_t *); -HRESULT D3D11_CompileFlatVertexShader(vlc_object_t *, const d3d11_shader_compiler_t *, d3d11_device_t *, d3d_vertex_shader_t *); +HRESULT D3D11_CompileFlatVertexShader(vlc_object_t *, const d3d11_shader_compiler_t *, d3d11_device_t *, d3d11_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_vertex_shader_t *); +HRESULT D3D11_CompileProjectionVertexShader(vlc_object_t *, const d3d11_shader_compiler_t *, d3d11_device_t *, d3d11_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 *); @@ -132,6 +132,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_ReleaseVertexShader(d3d_vertex_shader_t *); +void D3D11_ReleaseVertexShader(d3d11_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 256a2eda25..17bc981d60 100644 --- a/modules/video_output/win32/direct3d11.c +++ b/modules/video_output/win32/direct3d11.c @@ -114,8 +114,8 @@ struct vout_display_sys_t picture_sys_d3d11_t stagingSys; plane_t stagingPlanes[PICTURE_PLANE_MAX]; - d3d_vertex_shader_t projectionVShader; - d3d_vertex_shader_t flatVShader; + d3d11_vertex_shader_t projectionVShader; + d3d11_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 */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
