From 26008c628787c04ad1af69f86983b42e2c5d8a4c Mon Sep 17 00:00:00 2001
From: foreman
Date: Fri, 12 Dec 2014 16:54:07 -0500
Subject: [PATCH] P4 to Git Change 1105088 by gandryey@gera-dev-w7 on
2014/12/12 16:33:57
EPR #411134 - [Media SDK 1.1]: videoSurveillance application crashes for DX9
- leave clCreateImage2DFromD3D9ResourceAMD with internal interface
Affected files ...
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_d3d9.cpp#26 edit
[ROCm/clr commit: 3c4771025ccc473ee9a7da210bf7775bacb9f6dc]
---
projects/clr/opencl/api/opencl/amdocl/cl_d3d9.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_d3d9.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_d3d9.cpp
index 873699fc6d..c26df052f5 100644
--- a/projects/clr/opencl/api/opencl/amdocl/cl_d3d9.cpp
+++ b/projects/clr/opencl/api/opencl/amdocl/cl_d3d9.cpp
@@ -256,13 +256,13 @@ Monitor D3D9Object::resLock_;
//
// clCreateImage2DFromD3D9ResourceAMD
//
-RUNTIME_ENTRY_RET(cl_mem, clCreateImage2DFromD3D9ResourceAMD, (
+cl_mem clCreateImage2DFromD3D9ResourceAMD(
Context& amdContext,
cl_mem_flags flags,
cl_dx9_media_adapter_type_khr adapter_type,
cl_dx9_surface_info_khr* surface_info,
cl_uint plane,
- int* errcode_ret))
+ int* errcode_ret)
{
cl_dx9_surface_info_khr* cl_surf_info =
reinterpret_cast(surface_info);
@@ -292,7 +292,6 @@ RUNTIME_ENTRY_RET(cl_mem, clCreateImage2DFromD3D9ResourceAMD, (
*not_null(errcode_ret) = CL_SUCCESS;
return as_cl(pImage2DD3D9);
}
-RUNTIME_EXIT
//
// Helper function SyncD3D9Objects