GlSharingFunction tests update

Add mock of opengl32.dll to check that sharing functions are loaded

Change-Id: I361707ee9a506e84db51d4fa9c98823db2550fae

Author: kcencele

runtime/helpers/string_helpers.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

runtime/os_interface/windows/gl/gl_sharing_win.cpp

@@ -70,7 +70,7 @@ bool GLSharingFunctions::isGlSharingEnabled() {
     return oglLibAvailable;
 }
 
-bool GLSharingFunctions::isOpenGlExtensionSupported(const char *pExtensionString) {
+bool GLSharingFunctions::isOpenGlExtensionSupported(const unsigned char *pExtensionString) {
     bool LoadedNull = (glGetStringi == nullptr) || (glGetIntegerv == nullptr);
     if (LoadedNull) {
         return false;
@@ -79,8 +79,8 @@ bool GLSharingFunctions::isOpenGlExtensionSupported(const char *pExtensionString
     cl_int NumberOfExtensions = 0;
     glGetIntegerv(GL_NUM_EXTENSIONS, &NumberOfExtensions);
     for (cl_int i = 0; i < NumberOfExtensions; i++) {
-        const char *pString = reinterpret_cast<const char *>(glGetStringi(GL_EXTENSIONS, i));
-        if (strcmp(pString, pExtensionString) == 0) {
+        std::basic_string<unsigned char> pString = glGetStringi(GL_EXTENSIONS, i);
+        if (pString == pExtensionString) {
             return true;
         }
     }
@@ -89,30 +89,35 @@ bool GLSharingFunctions::isOpenGlExtensionSupported(const char *pExtensionString
 
 bool GLSharingFunctions::isOpenGlSharingSupported() {
 
-    const char *Vendor = reinterpret_cast<const char *>(glGetString(GL_VENDOR));
-    if ((Vendor == nullptr) || (strcmp(Vendor, "Intel") != 0)) {
+    std::basic_string<unsigned char> Vendor = glGetString(GL_VENDOR);
+    const unsigned char intelVendor[] = "Intel";
+
+    if ((Vendor.empty()) || (Vendor != intelVendor)) {
         return false;
     }
-
-    const char *Version = reinterpret_cast<const char *>(glGetString(GL_VERSION));
-    if (Version == nullptr) {
+    std::basic_string<unsigned char> Version = glGetString(GL_VERSION);
+    if (Version.empty()) {
         return false;
     }
 
     bool IsOpenGLES = false;
-    if (strstr(Version, "OpenGL ES") != NULL) {
+    const unsigned char versionES[] = "OpenGL ES";
+    if (Version.find(versionES) != std::string::npos) {
         IsOpenGLES = true;
     }
 
     if (IsOpenGLES == true) {
-        if (strstr(Version, "OpenGL ES 1.") != NULL) {
-            if (isOpenGlExtensionSupported("GL_OES_framebuffer_object") == false) {
+        const unsigned char versionES1[] = "OpenGL ES 1.";
+        if (Version.find(versionES1) != std::string::npos) {
+            const unsigned char supportGLOES[] = "GL_OES_framebuffer_object";
+            if (isOpenGlExtensionSupported(supportGLOES) == false) {
                 return false;
             }
         }
     } else {
         if (Version[0] < '3') {
-            if (isOpenGlExtensionSupported("GL_EXT_framebuffer_object") == false) {
+            const unsigned char supportGLEXT[] = "GL_EXT_framebuffer_object";
+            if (isOpenGlExtensionSupported(supportGLEXT) == false) {
                 return false;
             }
         }

runtime/sharings/gl/gl_sharing.h

@@ -163,7 +163,8 @@ class GLSharingFunctions : public SharingFunctions {
     }
 
     void createBackupContext();
-    bool isOpenGlExtensionSupported(const char *pExtensionString);
+
+    bool isOpenGlExtensionSupported(const unsigned char *pExtentionString);
     bool isOpenGlSharingSupported();
 
     std::mutex mutex;

unit_tests/CMakeLists.txt

@@ -130,6 +130,8 @@ option(SHOW_VERBOSE_UTESTS_RESULTS "Use the default/verbose test output" ON)
 
 if(NOT SHOW_VERBOSE_UTESTS_RESULTS)
   set(IGDRCL_TESTS_LISTENER_OPTION "--disable_default_listener")
+else()
+  set(IGDRCL_TESTS_LISTENER_OPTION "--enable_default_listener")
 endif()
 
 target_include_directories(igdrcl_tests PRIVATE

unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -29,7 +29,7 @@ TEST_F(EnqueueKernelTest, givenKernelWithSharedObjArgsWhenEnqueueIsCalledThenRes
     auto nonSharedBuffer = new MockBuffer;
     MockGlSharing glSharing;
     glSharing.uploadDataToBufferInfo(1, 0);
-    pContext->setSharingFunctions(new GlSharingFunctionsMock());
+    pContext->setSharingFunctions(glSharing.sharingFunctions.release());
     auto retVal = CL_SUCCESS;
     auto sharedBuffer = GlBuffer::createSharedGlBuffer(pContext, CL_MEM_READ_WRITE, 1, &retVal);
     auto sharedMem = static_cast<cl_mem>(sharedBuffer);

unit_tests/mocks/gl/mock_gl_sharing.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,20 +9,6 @@
 #include "unit_tests/mocks/gl/mock_gl_sharing.h"
 
 namespace OCLRT {
-int GLSetSharedOCLContextStateCalled = 0;
-int GLAcquireSharedBufferCalled = 0;
-int GLAcquireSharedRenderBufferCalled = 0;
-int GLAcquireSharedTextureCalled = 0;
-int GLReleaseSharedBufferCalled = 0;
-int GLReleaseSharedRenderBufferCalled = 0;
-int GLReleaseSharedTextureCalled = 0;
-int GLGetCurrentContextCalled = 0;
-int GLGetCurrentDisplayCalled = 0;
-int GLMakeCurrentCalled = 0;
-int GLDeleteContextCalled = 0;
-int WGLCreateContextCalled = 0;
-int WGLShareListsCalled = 0;
-int WGLDeleteContextCalled = 0;
 int EGLCreateContextCalled = 0;
 int EGLChooseConfigCalled = 0;
 int EGLDeleteContextCalled = 0;
@@ -31,50 +17,16 @@ int GlxQueryContextCalled = 0;
 int GlxCreateNewContextCalled = 0;
 int GlxDeleteContextCalled = 0;
 int GlxIsDirectCalled = 0;
-int GLRetainSyncCalled = 0;
-int GLReleaseSyncCalled = 0;
-int GLGetSyncivCalled = 0;
-
-CL_GL_BUFFER_INFO bufferInfoInput = {0};
-CL_GL_BUFFER_INFO bufferInfoOutput = {0};
-CL_GL_RESOURCE_INFO textureInfoInput = {0};
-CL_GL_RESOURCE_INFO textureInfoOutput = {0};
 EGLBkpContextParams eglBkpContextParams = {0};
 GLXBkpContextParams glxBkpContextParams = {0};
-GLMockReturnedValues glMockReturnedValues = {0};
 
 void GlSharingFunctionsMock::initMembers() {
-    GLSetSharedOCLContextState = mockGLSetSharedOCLContextState;
-    GLAcquireSharedBuffer = mockGLAcquireSharedBuffer;
-    GLAcquireSharedRenderBuffer = mockGLAcquireSharedRenderBuffer;
-    GLAcquireSharedTexture = mockGLAcquireSharedTexture;
-    GLReleaseSharedBuffer = mockGLReleaseSharedBuffer;
-    GLReleaseSharedRenderBuffer = mockGLReleaseSharedRenderBuffer;
-    GLReleaseSharedTexture = mockGLReleaseSharedTexture;
-    GLGetCurrentContext = mockGLGetCurrentContext;
-    GLGetCurrentDisplay = mockGLGetCurrentDisplay;
-    this->wglMakeCurrent = mockWGLMakeCurrent;
-    GLReleaseSync = mockGlReleaseSync;
-    GLRetainSync = mockGlRetainSync;
-    GLGetSynciv = mockGlGetSynciv;
-    pfnWglCreateContext = mockWGlCreateContext;
-    pfnWglShareLists = mockWGlShareLists;
-    pfnWglDeleteContext = mockWGLDeleteContext;
-
-    GLSetSharedOCLContextStateCalled = 0;
-    GLAcquireSharedBufferCalled = 0;
-    GLAcquireSharedRenderBufferCalled = 0;
-    GLAcquireSharedTextureCalled = 0;
-    GLReleaseSharedBufferCalled = 0;
-    GLReleaseSharedRenderBufferCalled = 0;
-    GLReleaseSharedTextureCalled = 0;
-    GLGetCurrentContextCalled = 0;
-    GLGetCurrentDisplayCalled = 0;
-    GLMakeCurrentCalled = 0;
-    GLDeleteContextCalled = 0;
-    WGLCreateContextCalled = 0;
-    WGLShareListsCalled = 0;
-    WGLDeleteContextCalled = 0;
+    GLSharingFunctions::initGLFunctions();
+    glDllHelper dllParam;
+    dllParam.setGLSetSharedOCLContextStateReturnedValue(1u);
+    dllParam.resetParam("");
+    dllParam.loadTexture({0});
+    dllParam.loadBuffer({0});
     EGLChooseConfigCalled = 0;
     EGLCreateContextCalled = 0;
     EGLDeleteContextCalled = 0;
@@ -83,23 +35,15 @@ void GlSharingFunctionsMock::initMembers() {
     GlxCreateNewContextCalled = 0;
     GlxDeleteContextCalled = 0;
     GlxIsDirectCalled = 0;
-    GLRetainSyncCalled = 0;
-    GLReleaseSyncCalled = 0;
-    GLGetSyncivCalled = 0;
-    memset(&bufferInfoInput, 0, sizeof(CL_GL_BUFFER_INFO));
-    memset(&bufferInfoOutput, 0, sizeof(CL_GL_BUFFER_INFO));
-    memset(&textureInfoInput, 0, sizeof(CL_GL_RESOURCE_INFO));
-    memset(&textureInfoOutput, 0, sizeof(CL_GL_RESOURCE_INFO));
     memset(&eglBkpContextParams, 0, sizeof(EGLBkpContextParams));
     memset(&glxBkpContextParams, 0, sizeof(GLXBkpContextParams));
-    memset(&glMockReturnedValues, 0, sizeof(GLMockReturnedValues));
 }
 
 GlSharingFunctionsMock::GlSharingFunctionsMock() {
     initMembers();
 }
 
 MockGlSharing::MockGlSharing(GLType glhdcType, GLContext glhglrcHandle, GLContext glhglrcHandleBkpCtx, GLDisplay glhdcHandle) {
-    m_sharingFunctions.setHandles(glhdcType, glhglrcHandle, glhglrcHandleBkpCtx, glhdcHandle);
+    sharingFunctions->setHandles(glhdcType, glhglrcHandle, glhglrcHandleBkpCtx, glhdcHandle);
 }
 } // namespace OCLRT