diff options
| -rw-r--r-- | src/cl_mem.c | 14 | ||||
| -rw-r--r-- | src/cl_mem.h | 1 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/cl_mem.c b/src/cl_mem.c index 75e8efb4..2b783b94 100644 --- a/src/cl_mem.c +++ b/src/cl_mem.c @@ -120,12 +120,16 @@ cl_get_mem_object_info(cl_mem mem, *((cl_context *)param_value) = mem->ctx; break; case CL_MEM_ASSOCIATED_MEMOBJECT: - if(mem->type != CL_MEM_SUBBUFFER_TYPE) { - *((cl_mem *)param_value) = NULL; - } else { + if(mem->type == CL_MEM_SUBBUFFER_TYPE) { struct _cl_mem_buffer* buf = (struct _cl_mem_buffer*)mem; *((cl_mem *)param_value) = (cl_mem)(buf->parent); - } + } else if (mem->type == CL_MEM_IMAGE_TYPE) { + *((cl_mem *)param_value) = mem; + } else if (mem->type == CL_MEM_BUFFER1D_IMAGE_TYPE) { + struct _cl_mem_buffer1d_image* image_buffer = (struct _cl_mem_buffer1d_image*)mem; + *((cl_mem *)param_value) = image_buffer->descbuffer; + } else + *((cl_mem *)param_value) = NULL; break; case CL_MEM_OFFSET: if(mem->type != CL_MEM_SUBBUFFER_TYPE) { @@ -1285,6 +1289,8 @@ _cl_mem_new_image_from_buffer(cl_context ctx, memcpy(dst, src, mem_buffer->base.size); cl_mem_unmap(image); cl_mem_unmap(buffer); + struct _cl_mem_buffer1d_image* image_buffer = (struct _cl_mem_buffer1d_image*)image; + image_buffer->descbuffer = buffer; } else assert(0); diff --git a/src/cl_mem.h b/src/cl_mem.h index 10467789..5a384ed6 100644 --- a/src/cl_mem.h +++ b/src/cl_mem.h @@ -155,6 +155,7 @@ struct _cl_mem_gl_image { struct _cl_mem_buffer1d_image { struct _cl_mem_image base; uint32_t size; + _cl_mem * descbuffer; }; inline static void |