enqueue-map: fix map_flags error

7 files changed, 15 insertions, 16 deletions

diff --git a/modules/ocl/cl_3a_stats_context.cpp b/modules/ocl/cl_3a_stats_context.cpp
index 87ed4d7..413cad0 100644
--- a/modules/ocl/cl_3a_stats_context.cpp
+++ b/modules/ocl/cl_3a_stats_context.cpp
@@ -206,7 +206,7 @@ CL3AStatsCalculatorContext::copy_stats_out (const SmartPtr<CLBuffer> &stats_cl_b
     ret = stats_cl_buf->enqueue_map (
               buf_ptr,
               0, _stats_mem_size,
-              CL_MEM_READ_ONLY,
+              CL_MAP_READ,
               CLEvent::EmptyList,
               event);
     XCAM_FAIL_RETURN (WARNING, ret == XCAM_RETURN_NO_ERROR, NULL, "3a stats enqueue read buffer failed.");
diff --git a/modules/ocl/cl_context.h b/modules/ocl/cl_context.h
index 9f15e08..280fd69 100644
--- a/modules/ocl/cl_context.h
+++ b/modules/ocl/cl_context.h
@@ -145,7 +145,7 @@ private:
         cl_mem buf_id, void *&ptr,
         uint32_t offset, uint32_t size,
         bool block = true,
-        cl_map_flags map_flags = CL_MEM_READ_WRITE,
+        cl_map_flags map_flags = CL_MAP_READ | CL_MAP_WRITE,
         CLEventList &events_wait = CLEvent::EmptyList,
         SmartPtr<CLEvent> &event_out = CLEvent::NullEvent);
 
@@ -156,7 +156,7 @@ private:
         size_t *image_row_pitch,
         size_t *image_slice_pitch,
         bool block = true,
-        cl_map_flags map_flags = CL_MEM_READ_WRITE,
+        cl_map_flags map_flags = CL_MAP_READ | CL_MAP_WRITE,
         CLEventList &events_wait = CLEvent::EmptyList,
         SmartPtr<CLEvent> &event_out = CLEvent::NullEvent);
 
diff --git a/modules/ocl/cl_fisheye_handler.cpp b/modules/ocl/cl_fisheye_handler.cpp
index cce8a70..c7087c2 100644
--- a/modules/ocl/cl_fisheye_handler.cpp
+++ b/modules/ocl/cl_fisheye_handler.cpp
@@ -326,7 +326,7 @@ dump_geo_table (SmartPtr<CLImage> table)
     char name[1024];
     snprintf (name, 1024, "geo_table_x_%dx%d.x", desc.width, desc.height);
     FILE *fp = fopen (name, "wb");
-    XCamReturn ret = table->enqueue_map (ptr, origin, region, &row_pitch, &slice_pitch, CL_MEM_READ_ONLY);
+    XCamReturn ret = table->enqueue_map (ptr, origin, region, &row_pitch, &slice_pitch, CL_MAP_READ);
     XCAM_ASSERT (ret == XCAM_RETURN_NO_ERROR);
 
     for (uint32_t i = 0; i < desc.height; ++i) {
@@ -392,7 +392,7 @@ CLFisheyeHandler::generate_fisheye_table (
         size_t region[3] = {table_width, table_height, 1};
         size_t row_pitch;
         size_t slice_pitch;
-        XCamReturn ret = _geo_table->enqueue_map ((void *&)map_ptr, origin, region, &row_pitch, &slice_pitch, CL_MEM_READ_WRITE);
+        XCamReturn ret = _geo_table->enqueue_map ((void *&)map_ptr, origin, region, &row_pitch, &slice_pitch, CL_MAP_WRITE);
         XCAM_ASSERT (ret == XCAM_RETURN_NO_ERROR);
 
         for (uint32_t row = 0; row < table_height; row++) {
diff --git a/modules/ocl/cl_memory.h b/modules/ocl/cl_memory.h
index 7012d53..7d4ffca 100644
--- a/modules/ocl/cl_memory.h
+++ b/modules/ocl/cl_memory.h
@@ -116,7 +116,7 @@ public:
         SmartPtr<CLEvent> &event_out = CLEvent::NullEvent);
     XCamReturn enqueue_map (
         void *&ptr, uint32_t offset, uint32_t size,
-        cl_map_flags map_flags = CL_MEM_READ_WRITE,
+        cl_map_flags map_flags = CL_MAP_READ | CL_MAP_WRITE,
         CLEventList &event_waits = CLEvent::EmptyList,
         SmartPtr<CLEvent> &event_out = CLEvent::NullEvent);
 
@@ -210,7 +210,7 @@ public:
         void *&ptr,
         size_t *origin, size_t *region,
         size_t *row_pitch, size_t *slice_pitch,
-        cl_map_flags map_flags = CL_MEM_READ_WRITE,
+        cl_map_flags map_flags = CL_MAP_READ | CL_MAP_WRITE,
         CLEventList &event_waits = CLEvent::EmptyList,
         SmartPtr<CLEvent> &event_out = CLEvent::NullEvent);
 
diff --git a/modules/ocl/cl_newwavelet_denoise_handler.cpp b/modules/ocl/cl_newwavelet_denoise_handler.cpp
index 3ca83d4..19ce275 100644
--- a/modules/ocl/cl_newwavelet_denoise_handler.cpp
+++ b/modules/ocl/cl_newwavelet_denoise_handler.cpp
@@ -187,7 +187,7 @@ CLWaveletNoiseEstimateKernel::estimate_noise_variance (const VideoBufferInfo & v
     ret = image->enqueue_map (buf_ptr,
                               origin, region,
                               &row_pitch, &slice_pitch,
-                              CL_MEM_READ_ONLY,
+                              CL_MAP_READ,
                               CLEvent::EmptyList,
                               map_event);
     if (ret != XCAM_RETURN_NO_ERROR) {
@@ -723,7 +723,7 @@ CLNewWaveletDenoiseImageHandler::dump_coeff (SmartPtr<CLImage> image, uint32_t c
     image->enqueue_map (buf_ptr,
                         origin, region,
                         &row_pitch, &slice_pitch,
-                        CL_MEM_READ_ONLY,
+                        CL_MAP_READ,
                         CLEvent::EmptyList,
                         map_event);
     XCAM_ASSERT (map_event->get_event_id ());
diff --git a/modules/ocl/cl_pyramid_blender.cpp b/modules/ocl/cl_pyramid_blender.cpp
index 14d91bd..8027098 100644
--- a/modules/ocl/cl_pyramid_blender.cpp
+++ b/modules/ocl/cl_pyramid_blender.cpp
@@ -745,7 +745,7 @@ CLPyramidBlender::fill_seam_mask ()
     if (_seam_mask_done)
         return XCAM_RETURN_NO_ERROR;
 
-    ret = _seam_sum_buf->enqueue_map ((void *&)sum_ptr, 0, sum_buf_size, CL_MEM_READ_ONLY);
+    ret = _seam_sum_buf->enqueue_map ((void *&)sum_ptr, 0, sum_buf_size, CL_MAP_READ);
     XCAM_FAIL_RETURN (ERROR, ret == XCAM_RETURN_NO_ERROR, ret, "CLPyramidBlender map seam_sum_buf failed");
 
     float min_sum = 9999999999.0f, tmp_sum;
@@ -771,12 +771,11 @@ CLPyramidBlender::fill_seam_mask ()
     size_t mask_region[3] = {mask_desc.width, mask_desc.height, 1};
     size_t mask_row_pitch;
     size_t mask_slice_pitch;
-    ret = seam_mask->enqueue_map (
-              (void *&)mask_ptr, mask_origin, mask_region,
-              &mask_row_pitch, &mask_slice_pitch, CL_MEM_READ_ONLY);
+    ret = seam_mask->enqueue_map ((void *&)mask_ptr, mask_origin, mask_region,
+                                  &mask_row_pitch, &mask_slice_pitch, CL_MAP_READ);
     XCAM_FAIL_RETURN (ERROR, ret == XCAM_RETURN_NO_ERROR, ret, "CLPyramidBlender map seam_mask failed");
     uint32_t mask_stride = mask_row_pitch / sizeof (SEAM_MASK_TYPE);
-    ret = _seam_pos_buf->enqueue_map ((void *&)pos_ptr, 0, pos_buf_size, CL_MEM_READ_ONLY);
+    ret = _seam_pos_buf->enqueue_map ((void *&)pos_ptr, 0, pos_buf_size, CL_MAP_READ);
     XCAM_FAIL_RETURN (ERROR, ret == XCAM_RETURN_NO_ERROR, ret, "CLPyramidBlender map seam_pos_buf failed");
     //printf ("***********min sum:%.3f, pos:%d, sum0:%.3f, sum1:%.3f\n", min_sum, pos, sum_ptr0[pos], sum_ptr1[pos]);
     for (i = _seam_height / 2 - 1; i >= 0; --i) {
@@ -1364,7 +1363,7 @@ CLPyramidBlender::dump_buffers ()
         const CLImageDesc &desc = images[i]->get_image_desc ();
         size_t origin[3] = {0, 0, 0};
         size_t region[3] = {desc.width, desc.height, 1};
-        XCamReturn ret = images[i]->enqueue_map ((void *&)ptr[i], origin, region, &row_pitch[i], &slice_pitch[i], CL_MEM_READ_ONLY);
+        XCamReturn ret = images[i]->enqueue_map ((void *&)ptr[i], origin, region, &row_pitch[i], &slice_pitch[i], CL_MAP_READ);
         XCAM_ASSERT (ret == XCAM_RETURN_NO_ERROR);
     }
     // offset UV, workaround of beignet
diff --git a/modules/ocl/cl_utils.cpp b/modules/ocl/cl_utils.cpp
index 6ad513b..14df762 100644
--- a/modules/ocl/cl_utils.cpp
+++ b/modules/ocl/cl_utils.cpp
@@ -34,7 +34,7 @@ write_image (SmartPtr<CLImage> image, const char *file_name)
     size_t row_pitch;
     size_t slice_pitch;
 
-    XCamReturn ret = image->enqueue_map (ptr, origin, region, &row_pitch, &slice_pitch, CL_MEM_READ_ONLY);
+    XCamReturn ret = image->enqueue_map (ptr, origin, region, &row_pitch, &slice_pitch, CL_MAP_READ);
     XCAM_ASSERT (ret == XCAM_RETURN_NO_ERROR);
     XCAM_ASSERT (ptr);
     XCAM_ASSERT (row_pitch == desc.row_pitch);