[vlc-commits] vout:d3d11: rename d3d11_shader_compiler_t to d3d_shader_compiler_t
Steve Lhomme
git at videolan.org
Wed Feb 10 11:06:46 UTC 2021
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Feb 9 15:40:57 2021 +0100| [211cd60ea425167170c28f596f4fe6ff20d62a53] | committer: Steve Lhomme
vout:d3d11: rename d3d11_shader_compiler_t to d3d_shader_compiler_t
The shader compiler isn't specific to D3D11
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=211cd60ea425167170c28f596f4fe6ff20d62a53
---
modules/video_output/win32/d3d11_shaders.c | 18 +++++++++---------
modules/video_output/win32/d3d11_shaders.h | 12 ++++++------
modules/video_output/win32/direct3d11.c | 4 ++--
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/modules/video_output/win32/d3d11_shaders.c b/modules/video_output/win32/d3d11_shaders.c
index 9a05592394..42e4dc1d77 100644
--- a/modules/video_output/win32/d3d11_shaders.c
+++ b/modules/video_output/win32/d3d11_shaders.c
@@ -191,10 +191,10 @@ VS_OUTPUT main( VS_INPUT In )\n\
}\n\
";
-static ID3DBlob* D3D11_CompileShader(vlc_object_t *, const d3d11_shader_compiler_t *, const d3d11_device_t *,
+static ID3DBlob* D3D11_CompileShader(vlc_object_t *, const d3d_shader_compiler_t *, const d3d11_device_t *,
const char *psz_shader, bool pixel);
-static HRESULT CompileTargetShader(vlc_object_t *o, const d3d11_shader_compiler_t *compiler,
+static HRESULT CompileTargetShader(vlc_object_t *o, const d3d_shader_compiler_t *compiler,
d3d11_device_t *d3d_dev,
bool texture_array, size_t texture_count,
const char *psz_sampler,
@@ -243,7 +243,7 @@ static HRESULT CompileTargetShader(vlc_object_t *o, const d3d11_shader_compiler_
return hr;
}
-HRESULT (D3D11_CompilePixelShader)(vlc_object_t *o, const d3d11_shader_compiler_t *compiler,
+HRESULT (D3D11_CompilePixelShader)(vlc_object_t *o, const d3d_shader_compiler_t *compiler,
d3d11_device_t *d3d_dev,
bool texture_array, size_t texture_count,
const display_info_t *display, bool sharp,
@@ -647,7 +647,7 @@ void D3D11_ReleasePixelShader(d3d11_quad_t *quad)
}
}
-static ID3DBlob* D3D11_CompileShader(vlc_object_t *obj, const d3d11_shader_compiler_t *compiler,
+static ID3DBlob* D3D11_CompileShader(vlc_object_t *obj, const d3d_shader_compiler_t *compiler,
const d3d11_device_t *d3d_dev,
const char *psz_shader, bool pixel)
{
@@ -778,7 +778,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,
+static HRESULT D3D11_CompileVertexShader(vlc_object_t *obj, const d3d_shader_compiler_t *compiler,
d3d11_device_t *d3d_dev, const char *psz_shader,
d3d11_vertex_shader_t *output)
{
@@ -829,13 +829,13 @@ void D3D11_ReleaseVertexShader(d3d11_vertex_shader_t *shader)
}
}
-HRESULT (D3D11_CompileFlatVertexShader)(vlc_object_t *obj, const d3d11_shader_compiler_t *compiler,
+HRESULT (D3D11_CompileFlatVertexShader)(vlc_object_t *obj, const d3d_shader_compiler_t *compiler,
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,
+HRESULT (D3D11_CompileProjectionVertexShader)(vlc_object_t *obj, const d3d_shader_compiler_t *compiler,
d3d11_device_t *d3d_dev, d3d11_vertex_shader_t *output)
{
return D3D11_CompileVertexShader(obj, compiler, d3d_dev, globVertexShaderProjection, output);
@@ -856,7 +856,7 @@ static HINSTANCE Direct3D11LoadShaderLibrary(void)
}
#endif // !VLC_WINSTORE_APP
-int (D3D11_InitShaders)(vlc_object_t *obj, d3d11_shader_compiler_t *compiler)
+int (D3D11_InitShaders)(vlc_object_t *obj, d3d_shader_compiler_t *compiler)
{
#if !VLC_WINSTORE_APP
compiler->compiler_dll = Direct3D11LoadShaderLibrary();
@@ -876,7 +876,7 @@ int (D3D11_InitShaders)(vlc_object_t *obj, d3d11_shader_compiler_t *compiler)
return VLC_SUCCESS;
}
-void D3D11_ReleaseShaders(d3d11_shader_compiler_t *compiler)
+void D3D11_ReleaseShaders(d3d_shader_compiler_t *compiler)
{
#if !VLC_WINSTORE_APP
if (compiler->compiler_dll)
diff --git a/modules/video_output/win32/d3d11_shaders.h b/modules/video_output/win32/d3d11_shaders.h
index 14e8407eb2..cb149c63d2 100644
--- a/modules/video_output/win32/d3d11_shaders.h
+++ b/modules/video_output/win32/d3d11_shaders.h
@@ -30,7 +30,7 @@ typedef struct
{
HINSTANCE compiler_dll; /* handle of the opened d3dcompiler dll */
pD3DCompile OurD3DCompile;
-} d3d11_shader_compiler_t;
+} d3d_shader_compiler_t;
#include <vlc_es.h>
@@ -102,10 +102,10 @@ typedef struct
VS_PROJECTION_CONST vertexConstants;
} d3d11_quad_t;
-int D3D11_InitShaders(vlc_object_t *, d3d11_shader_compiler_t *);
-void D3D11_ReleaseShaders(d3d11_shader_compiler_t *);
+int D3D11_InitShaders(vlc_object_t *, d3d_shader_compiler_t *);
+void D3D11_ReleaseShaders(d3d_shader_compiler_t *);
-HRESULT D3D11_CompilePixelShader(vlc_object_t *, const d3d11_shader_compiler_t *,
+HRESULT D3D11_CompilePixelShader(vlc_object_t *, const d3d_shader_compiler_t *,
d3d11_device_t *, bool texture_array, size_t texture_count,
const display_info_t *, bool sharp,
video_transfer_func_t, video_color_primaries_t,
@@ -115,10 +115,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 *, d3d11_vertex_shader_t *);
+HRESULT D3D11_CompileFlatVertexShader(vlc_object_t *, const d3d_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 *, d3d11_vertex_shader_t *);
+HRESULT D3D11_CompileProjectionVertexShader(vlc_object_t *, const d3d_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 *);
diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index 17bc981d60..0d905cd95b 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -100,8 +100,8 @@ struct vout_display_sys_t
d3d11_device_t *d3d_dev;
d3d11_decoder_device_t *local_d3d_dev; // when opened without a video context
- d3d11_shader_compiler_t shaders;
- d3d11_quad_t picQuad;
+ d3d_shader_compiler_t shaders;
+ d3d11_quad_t picQuad;
ID3D11Asynchronous *prepareWait;
#ifdef HAVE_D3D11_4_H
More information about the vlc-commits
mailing list