From 67994fc177810d6df649712cd502eac1be9eaacb Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Fri, 22 Mar 2019 21:09:38 +0100 Subject: [PATCH] removed unecessary parts causing build on some Intel OpenCLs to fail --- OpenCL/inc_zip_inflate.cl | 7 ------- OpenCL/m17200_a0-pure.cl | 6 +----- OpenCL/m17200_a1-pure.cl | 6 +----- OpenCL/m17200_a3-pure.cl | 6 +----- OpenCL/m17220_a0-pure.cl | 4 +--- OpenCL/m17220_a1-pure.cl | 6 +----- OpenCL/m17220_a3-pure.cl | 6 +----- 7 files changed, 6 insertions(+), 35 deletions(-) diff --git a/OpenCL/inc_zip_inflate.cl b/OpenCL/inc_zip_inflate.cl index 0009f8e3f..24633fe30 100644 --- a/OpenCL/inc_zip_inflate.cl +++ b/OpenCL/inc_zip_inflate.cl @@ -177,11 +177,6 @@ enum TINFL_FAST_LOOKUP_SIZE = 1 << TINFL_FAST_LOOKUP_BITS }; -typedef void *(*mz_alloc_func)(void *opaque, size_t items, size_t size); -typedef void (*mz_free_func)(void *opaque, void *address); -typedef void *(*mz_realloc_func)(void *opaque, void *address, size_t items, size_t size); - - typedef unsigned char mz_uint8; typedef signed short mz_int16; typedef unsigned short mz_uint16; @@ -438,8 +433,6 @@ typedef struct mz_stream_s char *msg; /* error msg (unused) */ struct inflate_state *state; /* internal state, allocated by zalloc/zfree */ - mz_alloc_func zalloc; /* optional heap allocation function (defaults to malloc) */ - mz_free_func zfree; /* optional heap free function (defaults to free) */ void *opaque; /* heap alloc function user pointer */ int data_type; /* data_type (unused) */ diff --git a/OpenCL/m17200_a0-pure.cl b/OpenCL/m17200_a0-pure.cl index 8fab34e48..276353245 100644 --- a/OpenCL/m17200_a0-pure.cl +++ b/OpenCL/m17200_a0-pure.cl @@ -659,8 +659,6 @@ __kernel void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) unsigned char inflated[MAX_UNCOMPRESSED_LENGTH]; mz_stream infstream; inflate_state pStream; - infstream.zalloc = Z_NULL; - infstream.zfree = Z_NULL; infstream.opaque = Z_NULL; infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input infstream.next_in = (Bytef *) compressed; // input char array @@ -931,8 +929,6 @@ __kernel void m17200_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) unsigned char inflated[MAX_UNCOMPRESSED_LENGTH]; mz_stream infstream; inflate_state pStream; - infstream.zalloc = Z_NULL; - infstream.zfree = Z_NULL; infstream.opaque = Z_NULL; infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input infstream.next_in = (Bytef *) compressed; // input char array @@ -964,4 +960,4 @@ __kernel void m17200_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) } } } -} \ No newline at end of file +} diff --git a/OpenCL/m17200_a1-pure.cl b/OpenCL/m17200_a1-pure.cl index 1ab9916f8..7d2ec0eb8 100644 --- a/OpenCL/m17200_a1-pure.cl +++ b/OpenCL/m17200_a1-pure.cl @@ -659,8 +659,6 @@ __kernel void m17200_sxx (KERN_ATTR_ESALT (pkzip_t)) unsigned char inflated[MAX_UNCOMPRESSED_LENGTH]; mz_stream infstream; inflate_state pStream; - infstream.zalloc = Z_NULL; - infstream.zfree = Z_NULL; infstream.opaque = Z_NULL; infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input infstream.next_in = (Bytef *)compressed; // input char array @@ -932,8 +930,6 @@ __kernel void m17200_mxx (KERN_ATTR_ESALT (pkzip_t)) unsigned char inflated[MAX_UNCOMPRESSED_LENGTH]; mz_stream infstream; inflate_state pStream; - infstream.zalloc = Z_NULL; - infstream.zfree = Z_NULL; infstream.opaque = Z_NULL; infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input infstream.next_in = (Bytef *)compressed; // input char array @@ -964,4 +960,4 @@ __kernel void m17200_mxx (KERN_ATTR_ESALT (pkzip_t)) } } } -} \ No newline at end of file +} diff --git a/OpenCL/m17200_a3-pure.cl b/OpenCL/m17200_a3-pure.cl index fb65d2438..b739ce6df 100644 --- a/OpenCL/m17200_a3-pure.cl +++ b/OpenCL/m17200_a3-pure.cl @@ -665,8 +665,6 @@ __kernel void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) unsigned char inflated[MAX_UNCOMPRESSED_LENGTH]; mz_stream infstream; inflate_state pStream; - infstream.zalloc = Z_NULL; - infstream.zfree = Z_NULL; infstream.opaque = Z_NULL; infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input infstream.next_in = (Bytef *)compressed; // input char array @@ -944,8 +942,6 @@ __kernel void m17200_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) unsigned char inflated[MAX_UNCOMPRESSED_LENGTH]; mz_stream infstream; inflate_state pStream; - infstream.zalloc = Z_NULL; - infstream.zfree = Z_NULL; infstream.opaque = Z_NULL; infstream.avail_in = esalt_bufs[digests_offset].hash.data_length - 12; // size of input infstream.next_in = (Bytef *)compressed; // input char array @@ -976,4 +972,4 @@ __kernel void m17200_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) } } } -} \ No newline at end of file +} diff --git a/OpenCL/m17220_a0-pure.cl b/OpenCL/m17220_a0-pure.cl index 0a6dcf202..0b02e2b17 100644 --- a/OpenCL/m17220_a0-pure.cl +++ b/OpenCL/m17220_a0-pure.cl @@ -675,8 +675,6 @@ __kernel void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) unsigned char inflated[MAX_UNCOMPRESSED_LENGTH]; mz_stream infstream; inflate_state pStream; - infstream.zalloc = Z_NULL; - infstream.zfree = Z_NULL; infstream.opaque = Z_NULL; infstream.avail_in = esalt_bufs[digests_offset].hashes[idx].data_length - 12; // size of input infstream.next_in = (Bytef *)compressed; // input char array @@ -1000,4 +998,4 @@ __kernel void m17220_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) idx = 0xfe; } } -} \ No newline at end of file +} diff --git a/OpenCL/m17220_a1-pure.cl b/OpenCL/m17220_a1-pure.cl index c11a2ca08..d3717aa74 100644 --- a/OpenCL/m17220_a1-pure.cl +++ b/OpenCL/m17220_a1-pure.cl @@ -675,8 +675,6 @@ __kernel void m17220_sxx (KERN_ATTR_ESALT (pkzip_t)) unsigned char inflated[MAX_UNCOMPRESSED_LENGTH]; mz_stream infstream; inflate_state pStream; - infstream.zalloc = Z_NULL; - infstream.zfree = Z_NULL; infstream.opaque = Z_NULL; infstream.avail_in = esalt_bufs[digests_offset].hashes[idx].data_length - 12; // size of input infstream.next_in = (Bytef *)compressed; // input char array @@ -967,8 +965,6 @@ __kernel void m17220_mxx (KERN_ATTR_ESALT (pkzip_t)) unsigned char inflated[MAX_UNCOMPRESSED_LENGTH]; mz_stream infstream; inflate_state pStream; - infstream.zalloc = Z_NULL; - infstream.zfree = Z_NULL; infstream.opaque = Z_NULL; infstream.avail_in = esalt_bufs[digests_offset].hashes[idx].data_length - 12; // size of input infstream.next_in = (Bytef *)compressed; // input char array @@ -1002,4 +998,4 @@ __kernel void m17220_mxx (KERN_ATTR_ESALT (pkzip_t)) idx = 0xfe; } } -} \ No newline at end of file +} diff --git a/OpenCL/m17220_a3-pure.cl b/OpenCL/m17220_a3-pure.cl index 98c20276c..a919df7e4 100644 --- a/OpenCL/m17220_a3-pure.cl +++ b/OpenCL/m17220_a3-pure.cl @@ -679,8 +679,6 @@ __kernel void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) unsigned char inflated[MAX_UNCOMPRESSED_LENGTH]; mz_stream infstream; inflate_state pStream; - infstream.zalloc = Z_NULL; - infstream.zfree = Z_NULL; infstream.opaque = Z_NULL; infstream.avail_in = esalt_bufs[digests_offset].hashes[idx].data_length - 12; // size of input infstream.next_in = (Bytef *)compressed; // input char array @@ -974,8 +972,6 @@ __kernel void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) unsigned char inflated[MAX_UNCOMPRESSED_LENGTH]; mz_stream infstream; inflate_state pStream; - infstream.zalloc = Z_NULL; - infstream.zfree = Z_NULL; infstream.opaque = Z_NULL; infstream.avail_in = esalt_bufs[digests_offset].hashes[idx].data_length - 12; // size of input infstream.next_in = (Bytef *)compressed; // input char array @@ -1009,4 +1005,4 @@ __kernel void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) idx = 0xfe; } } -} \ No newline at end of file +}