[vlc-commits] direct3d9: code cleaning

Steve Lhomme git at videolan.org
Thu Nov 15 14:19:59 CET 2018


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Nov 15 09:25:28 2018 +0100| [55ae8b0d44266bf1c7cfccfc20362afb9c6750c3] | committer: Steve Lhomme

direct3d9: code cleaning

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

 modules/video_output/win32/direct3d9.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c
index 7db2dc3545..f4eaf18d47 100644
--- a/modules/video_output/win32/direct3d9.c
+++ b/modules/video_output/win32/direct3d9.c
@@ -1164,9 +1164,9 @@ static void Direct3D9DestroyScene(vout_display_t *vd)
     msg_Dbg(vd, "Direct3D9 scene released successfully");
 }
 
+#ifdef HAVE_D3DX9EFFECT_H
 static int Direct3D9CompileShader(vout_display_t *vd, const char *shader_source, size_t source_length)
 {
-#ifdef HAVE_D3DX9EFFECT_H
     vout_display_sys_t *sys = vd->sys;
 
     HRESULT (WINAPI * OurD3DXCompileShader)(
@@ -1217,12 +1217,12 @@ static int Direct3D9CompileShader(vout_display_t *vd, const char *shader_source,
         return VLC_EGENERIC;
     }
     return VLC_SUCCESS;
+}
 #else
-    return VLC_EGENERIC;
+# define Direct3D9CompileShader(a,b,c)  VLC_EGENERIC
 #endif
-}
 
-#define MAX_SHADER_FILE_SIZE 1024*1024
+#define MAX_SHADER_FILE_SIZE  (1024*1024)
 
 static int Direct3D9CreateShaders(vout_display_t *vd)
 {



More information about the vlc-commits mailing list