Process extra properties for Context

Change-Id: Ic4b3af368a734109188dcd725f1fcf8c17fbb59e Signed-off-by: Filip Hazubski <[email protected]>
intel · Nov 22, 2018 · 3cb8683 · 3cb8683
1 parent 352450a
commit 3cb8683
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/runtime/context/CMakeLists.txt b/runtime/context/CMakeLists.txt
@@ -7,6 +7,7 @@
 set(RUNTIME_SRCS_CONTEXT
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/context.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/context_extra.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/context.h
   ${CMAKE_CURRENT_SOURCE_DIR}/context.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/driver_diagnostics.cpp

diff --git a/runtime/context/context.cpp b/runtime/context/context.cpp
@@ -110,6 +110,7 @@ bool Context::createImpl(const cl_context_properties *properties,
             cl_platform_id pid = platform();
             if (reinterpret_cast<cl_platform_id>(propertyValue) != pid) {
                 errcodeRet = CL_INVALID_PLATFORM;
+                return false;
             }
         } break;
         case CL_CONTEXT_SHOW_DIAGNOSTICS_INTEL:
@@ -120,13 +121,13 @@ bool Context::createImpl(const cl_context_properties *properties,
             break;
         default:
             if (!sharingBuilder->processProperties(propertyType, propertyValue, errcodeRet)) {
-                errcodeRet = CL_INVALID_PROPERTY;
+                errcodeRet = processExtraProperties(propertyType, propertyValue);
+            }
+            if (errcodeRet != CL_SUCCESS) {
+                return false;
             }
             break;
         }
-        if (errcodeRet != CL_SUCCESS) {
-            return false;
-        }
     }
 
     auto numProperties = ptrDiff(propertiesCurrent, properties) / sizeof(cl_context_properties);

diff --git a/runtime/context/context.h b/runtime/context/context.h
@@ -125,6 +125,8 @@ class Context : public BaseObject<_cl_context> {
     // OS specific implementation
     void *getOsContextInfo(cl_context_info &paramName, size_t *srcParamSize);
 
+    cl_int processExtraProperties(cl_context_properties propertyType, cl_context_properties propertyValue);
+
     const cl_context_properties *properties;
     size_t numProperties;
     void(CL_CALLBACK *contextCallback)(const char *, const void *, size_t, void *);

diff --git a/runtime/context/context_extra.cpp b/runtime/context/context_extra.cpp
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "runtime/context/context.h"
+
+namespace OCLRT {
+
+cl_int Context::processExtraProperties(cl_context_properties propertyType, cl_context_properties propertyValue) {
+    return CL_INVALID_PROPERTY;
+}
+
+} // namespace OCLRT