SWDEV-510271 - [6.4 Preview] fix hipCreateSurfaceObject & hipDestroySurfaceObject during stream capture (#127)

lttamd · web-flow · commit 10ef720cebe3 · 2025-05-14T21:25:30.000+05:30
diff --git a/hipamd/src/hip_surface.cpp b/hipamd/src/hip_surface.cpp
@@ -66,6 +66,10 @@ hipError_t ihipCreateSurfaceObject(hipSurfaceObject_t* pSurfObject,
     return hipErrorInvalidValue;
   }
 
+  if (!hip::tls.capture_streams_.empty() || !g_captureStreams.empty()) {
+    HIP_RETURN(hipErrorStreamCaptureUnsupported);
+  }
+
   amd::Image* image = nullptr;
   cl_mem memObj = reinterpret_cast<cl_mem>(pResDesc->res.array.array->data);
   if (!is_valid(memObj)) {
@@ -96,6 +100,10 @@ hipError_t ihipDestroySurfaceObject(hipSurfaceObject_t surfaceObject) {
     return hipSuccess;
   }
 
+  if (!hip::tls.capture_streams_.empty() || !g_captureStreams.empty()) {
+    HIP_RETURN(hipErrorStreamCaptureUnsupported);
+  }
+
   return ihipFree(surfaceObject);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,10 @@ hipError_t ihipCreateSurfaceObject(hipSurfaceObject_t* pSurfObject,`
`66`	`66`	`return hipErrorInvalidValue;`
`67`	`67`	`}`
`68`	`68`
	`69`	`+ if (!hip::tls.capture_streams_.empty() \|\| !g_captureStreams.empty()) {`
	`70`	`+ HIP_RETURN(hipErrorStreamCaptureUnsupported);`
	`71`	`+ }`
	`72`	`+`
`69`	`73`	`amd::Image* image = nullptr;`
`70`	`74`	`cl_mem memObj = reinterpret_cast<cl_mem>(pResDesc->res.array.array->data);`
`71`	`75`	`if (!is_valid(memObj)) {`
`@@ -96,6 +100,10 @@ hipError_t ihipDestroySurfaceObject(hipSurfaceObject_t surfaceObject) {`
`96`	`100`	`return hipSuccess;`
`97`	`101`	`}`
`98`	`102`
	`103`	`+ if (!hip::tls.capture_streams_.empty() \|\| !g_captureStreams.empty()) {`
	`104`	`+ HIP_RETURN(hipErrorStreamCaptureUnsupported);`
	`105`	`+ }`
	`106`	`+`
`99`	`107`	`return ihipFree(surfaceObject);`
`100`	`108`	`}`
`101`	`109`