Move macros DGST_R0 - DGST_R3 to host, define dgst_size for opencl kernel from host...

[hashcat.git] / OpenCL / m10100_a3.cl

diff --git a/OpenCL/m10100_a3.cl b/OpenCL/m10100_a3.cl
index 98a8e75..e7916db 100644 (file)
--- a/OpenCL/m10100_a3.cl
+++ b/OpenCL/m10100_a3.cl
@@ -7,18 +7,12 @@
 
 #define NEW_SIMD_CODE
 
-#include "include/constants.h"
-#include "include/kernel_vendor.h"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
-#include "include/kernel_functions.c"
-#include "OpenCL/types_ocl.c"
-#include "OpenCL/common.c"
-#include "OpenCL/simd.c"
+#include "inc_vendor.cl"
+#include "inc_hash_constants.h"
+#include "inc_hash_functions.cl"
+#include "inc_types.cl"
+#include "inc_common.cl"
+#include "inc_simd.cl"
 
 #define SIPROUND(v0,v1,v2,v3) \
   (v0) += (v1);               \
@@ -119,10 +113,10 @@ void m10100m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_r
 
     const u32x a = l32_from_64 (v);
     const u32x b = h32_from_64 (v);
-    const u32x c = 0;
-    const u32x d = 0;
 
-    COMPARE_M_SIMD (a, b, c, d);
+    const u32x z = 0;
+
+    COMPARE_M_SIMD (a, b, z, z);
   }
 }
 
@@ -161,8 +155,8 @@ void m10100s (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_r
   {
     digests_buf[digests_offset].digest_buf[DGST_R0],
     digests_buf[digests_offset].digest_buf[DGST_R1],
-    digests_buf[digests_offset].digest_buf[DGST_R2],
-    digests_buf[digests_offset].digest_buf[DGST_R3]
+    0,
+    0
   };
 
   /**
@@ -221,10 +215,10 @@ void m10100s (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_r
 
     const u32x a = l32_from_64 (v);
     const u32x b = h32_from_64 (v);
-    const u32x c = 0;
-    const u32x d = 0;
 
-    COMPARE_S_SIMD (a, b, c, d);
+    const u32x z = 0;
+
+    COMPARE_S_SIMD (a, b, z, z);
   }
 }