Switch to new version of GT-Pin headers

Change-Id: I909d1c578b4b9c3d7e24d3e33a9bfd86a815ab14
This commit is contained in:
hjnapiat
2018-01-12 15:00:36 +01:00
committed by sys_ocldev
parent af77720f9c
commit 111897132e
9 changed files with 34 additions and 56 deletions

View File

@@ -20,7 +20,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include "gtpin_dx11_interface.h"
#include "gtpin_ocl_interface.h"
#include "runtime/gtpin/gtpin_hw_helper.h"
namespace OCLRT {

View File

@@ -20,7 +20,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include "gtpin_dx11_interface.h"
#include "gtpin_ocl_interface.h"
#include "runtime/gtpin/gtpin_hw_helper.h"
namespace OCLRT {

View File

@@ -21,7 +21,7 @@
*/
#include "config.h"
#include "gtpin_dx11_interface.h"
#include "gtpin_ocl_interface.h"
#include "CL/cl.h"
#include "runtime/device/device.h"
#include "runtime/device/device_info.h"
@@ -32,7 +32,7 @@ using namespace gtpin;
namespace OCLRT {
extern bool isGTPinInitialized;
extern gtpin::dx11::gtpin_events_t GTPinCallbacks;
extern gtpin::ocl::gtpin_events_t GTPinCallbacks;
igc_init_t *pIgcInfo = nullptr;

View File

@@ -22,7 +22,7 @@
*/
#include "config.h"
#include "gtpin_dx11_interface.h"
#include "gtpin_ocl_interface.h"
#include "gtpin_helpers.h"
#include "CL/cl.h"
#include "runtime/context/context.h"

View File

@@ -33,17 +33,17 @@ using namespace OCLRT;
namespace OCLRT {
bool isGTPinInitialized = false;
gtpin::dx11::gtpin_events_t GTPinCallbacks = {0};
gtpin::ocl::gtpin_events_t GTPinCallbacks = {0};
}
GTPIN_DI_STATUS GTPin_Init(gtpin::dx11::gtpin_events_t *pGtpinEvents, driver_services_t *pDriverServices,
GTPIN_DI_STATUS GTPin_Init(gtpin::ocl::gtpin_events_t *pGtpinEvents, driver_services_t *pDriverServices,
uint32_t *pDriverVersion) {
if (isGTPinInitialized) {
return GTPIN_DI_ERROR_INSTANCE_ALREADY_CREATED;
}
if (pDriverVersion != nullptr) {
// GT-Pin is asking to obtain GT-Pin Interface version that is supported
*pDriverVersion = gtpin::dx11::GTPIN_DX11_INTERFACE_VERSION;
*pDriverVersion = gtpin::ocl::GTPIN_OCL_INTERFACE_VERSION;
if ((pDriverServices == nullptr) || (pGtpinEvents == nullptr)) {
return GTPIN_DI_SUCCESS;
@@ -55,10 +55,9 @@ GTPIN_DI_STATUS GTPin_Init(gtpin::dx11::gtpin_events_t *pGtpinEvents, driver_ser
if ((pGtpinEvents->onContextCreate == nullptr) ||
(pGtpinEvents->onContextDestroy == nullptr) ||
(pGtpinEvents->onKernelCreate == nullptr) ||
(pGtpinEvents->onDraw == nullptr) ||
(pGtpinEvents->onKernelSubmit == nullptr) ||
(pGtpinEvents->onCommandBufferCreate == nullptr) ||
(pGtpinEvents->onCommandBufferSubmit == nullptr)) {
(pGtpinEvents->onCommandBufferComplete == nullptr)) {
return GTPIN_DI_ERROR_INVALID_ARGUMENT;
}

View File

@@ -21,13 +21,13 @@
*/
#pragma once
#include "gtpin_dx11_interface.h"
#include "gtpin_ocl_interface.h"
#ifdef __cplusplus
extern "C" {
#endif
gtpin::GTPIN_DI_STATUS GTPin_Init(gtpin::dx11::gtpin_events_t *pGtpinEvents, gtpin::driver_services_t *pDriverServices, uint32_t *pDriverVersion);
gtpin::GTPIN_DI_STATUS GTPin_Init(gtpin::ocl::gtpin_events_t *pGtpinEvents, gtpin::driver_services_t *pDriverServices, uint32_t *pDriverVersion);
#ifdef __cplusplus
}