Revert "Move shared helper files to shared directory"

This reverts commit 459524f129.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2022-04-27 12:28:48 +02:00
committed by Compute-Runtime-Automation
parent e3b1d8b43c
commit 903cf766b3
46 changed files with 87 additions and 80 deletions

View File

@@ -62,7 +62,14 @@ if(SUPPORT_PVC_AND_LATER)
list(APPEND RUNTIME_SRCS_HELPERS_BASE ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_pvc_and_later.inl)
endif()
set(RUNTIME_SRCS_HELPERS_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/windows/gl_helper.h
)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_HELPERS_BASE})
if(WIN32)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_HELPERS_WINDOWS})
endif()
set_property(GLOBAL PROPERTY RUNTIME_SRCS_HELPERS_BASE ${RUNTIME_SRCS_HELPERS_BASE})

View File

@@ -0,0 +1,32 @@
/*
* Copyright (C) 2018-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/os_interface/os_library.h"
#include "GL/gl.h"
namespace Os {
extern const char *openglDllName;
}
namespace NEO {
class glFunctionHelper {
public:
glFunctionHelper::glFunctionHelper(OsLibrary *glLibrary, const std::string &functionName) {
glFunctionPtr = (*glLibrary)[functionName];
}
ConvertibleProcAddr operator[](const char *name) {
return ConvertibleProcAddr{glFunctionPtr(name)};
}
protected:
// clang-format off
PROC(__stdcall *glFunctionPtr)(LPCSTR Arg1) = nullptr;
// clang-format on
};
}; // namespace NEO

View File

@@ -7,9 +7,8 @@
#include "opencl/source/sharings/gl/windows/gl_sharing_windows.h"
#include "shared/source/helpers/windows/gl_helper.h"
#include "opencl/source/context/context.inl"
#include "opencl/source/helpers/windows/gl_helper.h"
#include "opencl/source/sharings/gl/gl_arb_sync_event.h"
namespace NEO {