[vlc-commits] direct3d11: don't share the prototype of D3D11_CompileShader

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue May 28 09:19:15 2019 +0200| [38319885e7bbf0ab7a92941b41334ec61ef20a4d] | committer: Steve Lhomme

direct3d11: don't share the prototype of D3D11_CompileShader

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

 modules/video_output/win32/d3d11_shaders.c | 9 ++++++---
 modules/video_output/win32/d3d11_shaders.h | 4 ----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/video_output/win32/d3d11_shaders.c b/modules/video_output/win32/d3d11_shaders.c
index 37a11b0531..14bd536aec 100644
--- a/modules/video_output/win32/d3d11_shaders.c
+++ b/modules/video_output/win32/d3d11_shaders.c
@@ -195,6 +195,9 @@ VS_OUTPUT main( VS_INPUT In )\n\
 }\n\
 ";
 
+static ID3DBlob* D3D11_CompileShader(vlc_object_t *, const d3d11_handle_t *, const d3d11_device_t *,
+                              const char *psz_shader, bool pixel);
+
 bool IsRGBShader(const d3d_format_t *cfg)
 {
     return cfg->resourceFormat[0] != DXGI_FORMAT_R8_UNORM &&
@@ -630,9 +633,9 @@ void D3D11_ReleasePixelShader(d3d_quad_t *quad)
     }
 }
 
-#undef D3D11_CompileShader
-ID3DBlob* D3D11_CompileShader(vlc_object_t *obj, const d3d11_handle_t *hd3d, const d3d11_device_t *d3d_dev,
-                              const char *psz_shader, bool pixel)
+static ID3DBlob* D3D11_CompileShader(vlc_object_t *obj, const d3d11_handle_t *hd3d,
+                                     const d3d11_device_t *d3d_dev,
+                                     const char *psz_shader, bool pixel)
 {
     ID3DBlob* pShaderBlob = NULL, *pErrBlob;
     const char *target;
diff --git a/modules/video_output/win32/d3d11_shaders.h b/modules/video_output/win32/d3d11_shaders.h
index 576eea64ba..16c6bdb8ee 100644
--- a/modules/video_output/win32/d3d11_shaders.h
+++ b/modules/video_output/win32/d3d11_shaders.h
@@ -95,10 +95,6 @@ typedef struct
 
 #define D3D11_MAX_RENDER_TARGET    2
 
-ID3DBlob* D3D11_CompileShader(vlc_object_t *, const d3d11_handle_t *, const d3d11_device_t *,
-                              const char *psz_shader, bool pixel);
-#define D3D11_CompileShader(a,b,c,d,e)  D3D11_CompileShader(VLC_OBJECT(a),b,c,d,e)
-
 bool IsRGBShader(const d3d_format_t *);
 
 HRESULT D3D11_CompilePixelShader(vlc_object_t *, d3d11_handle_t *, bool legacy_shader,