intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-04 23:56:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove gl sharing related code from os_interface

Browse Source 
Change-Id: Iece2fbdadefe338384f8961eef2720ff9b381e23
Signed-off-by: Maciej Dziuban <maciej.dziuban@intel.com>
This commit is contained in:
Maciej Dziuban
2020-03-30 15:54:49 +00:00
committed by sys_ocldev
parent 2ac968e6c2
commit 24cee4611d
21 changed files with 196 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opencl/test/unit_test/api/gl/cl_get_gl_context_info_khr_tests.cpp
View File

@@ -12,7 +12,7 @@
#include "opencl/test/unit_test/api/cl_api_tests.h"
#include "opencl/test/unit_test/mocks/mock_device.h"
#include "opencl/test/unit_test/mocks/mock_platform.h"
#include "opencl/test/unit_test/os_interface/windows/gl/gl_dll_helper.h"
#include "opencl/test/unit_test/sharings/gl/windows/gl_dll_helper.h"
using namespace NEO;

2
opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h
View File

@@ -8,7 +8,7 @@
#pragma once
#include "opencl/extensions/public/cl_gl_private_intel.h"
#include "opencl/source/sharings/gl/windows/gl_sharing_windows.h"
#include "opencl/test/unit_test/os_interface/windows/gl/gl_dll_helper.h"
#include "opencl/test/unit_test/sharings/gl/windows/gl_dll_helper.h"
#include "config.h"

15
opencl/test/unit_test/os_interface/windows/gl/CMakeLists.txt
View File

@@ -1,15 +0,0 @@
#
# Copyright (C) 2017-2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
if(WIN32)
set(IGDRCL_SRCS_tests_os_interface_windows_gl
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/gl_os_sharing_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gl_options.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gl_dll_helper.h
)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_os_interface_windows_gl})
endif()

3
opencl/test/unit_test/sharings/gl/windows/CMakeLists.txt
View File

@@ -9,6 +9,9 @@ if(WIN32)
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/gl_arb_sync_event_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gl_create_from_texture_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gl_dll_helper.h
${CMAKE_CURRENT_SOURCE_DIR}/gl_library_name.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gl_os_sharing_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gl_reused_buffers_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gl_sharing_enable_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gl_sharing_tests.cpp

0
opencl/test/unit_test/os_interface/windows/gl/gl_dll_helper.h → opencl/test/unit_test/sharings/gl/windows/gl_dll_helper.h
View File

0
opencl/test/unit_test/os_interface/windows/gl/gl_options.cpp → opencl/test/unit_test/sharings/gl/windows/gl_library_name.cpp
View File

0
opencl/test/unit_test/os_interface/windows/gl/gl_os_sharing_tests.cpp → opencl/test/unit_test/sharings/gl/windows/gl_os_sharing_tests.cpp
View File

16
opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp
View File

@@ -36,7 +36,7 @@
#include "opencl/test/unit_test/mocks/mock_memory_manager.h"
#include "test.h"
#include "gl/gl_sharing_os.h"
#include "gl_types.h"
using namespace NEO;
bool MockGLSharingFunctions::SharingEnabled = false;
@@ -769,7 +769,7 @@ TEST(glSharingBasicTest, givenNumEntriesLowerThanSupportedFormatsWhenGettingSupp
EXPECT_EQ(CL_SUCCESS, retVal);
EXPECT_EQ(static_cast<uint32_t>(GlSharing::gLToCLFormats.size()), numImageFormats);
EXPECT_EQ(static_cast<uint32_t>(GlSharing::glToCLFormats.size()), numImageFormats);
EXPECT_NE(0u, glFormats[0]);
EXPECT_EQ(0u, glFormats[1]);
EXPECT_EQ(0u, glFormats[2]);
@@ -787,10 +787,10 @@ TEST(glSharingBasicTest, givenCorrectFlagsWhenGettingSupportedFormatsThenCorrect
auto result = glSharingFunctions.getSupportedFormats(flag, image_type, arrayCount(glFormats), glFormats, &numImageFormats);
EXPECT_EQ(CL_SUCCESS, result);
EXPECT_EQ(static_cast<uint32_t>(GlSharing::gLToCLFormats.size()), numImageFormats);
EXPECT_EQ(static_cast<uint32_t>(GlSharing::glToCLFormats.size()), numImageFormats);
for (uint32_t formatIndex = 0; formatIndex < arrayCount(glFormats); formatIndex++) {
EXPECT_NE(GlSharing::gLToCLFormats.end(), GlSharing::gLToCLFormats.find(glFormats[formatIndex]));
EXPECT_NE(GlSharing::glToCLFormats.end(), GlSharing::glToCLFormats.find(glFormats[formatIndex]));
}
}
}
@@ -807,10 +807,10 @@ TEST(glSharingBasicTest, givenSupportedImageTypesWhenGettingSupportedFormatsThen
auto result = glSharingFunctions.getSupportedFormats(flags, image_type, arrayCount(glFormats), glFormats, &numImageFormats);
EXPECT_EQ(CL_SUCCESS, result);
EXPECT_EQ(static_cast<uint32_t>(GlSharing::gLToCLFormats.size()), numImageFormats);
EXPECT_EQ(static_cast<uint32_t>(GlSharing::glToCLFormats.size()), numImageFormats);
for (auto glFormat : glFormats) {
EXPECT_NE(GlSharing::gLToCLFormats.end(), GlSharing::gLToCLFormats.find(glFormat));
EXPECT_NE(GlSharing::glToCLFormats.end(), GlSharing::glToCLFormats.find(glFormat));
}
}
}
@@ -824,7 +824,7 @@ TEST(glSharingBasicTest, givenZeroNumEntriesWhenGettingSupportedFormatsThenNumFo
auto result = glSharingFunctions.getSupportedFormats(flags, image_type, 0, nullptr, &numImageFormats);
EXPECT_EQ(CL_SUCCESS, result);
EXPECT_EQ(static_cast<uint32_t>(GlSharing::gLToCLFormats.size()), numImageFormats);
EXPECT_EQ(static_cast<uint32_t>(GlSharing::glToCLFormats.size()), numImageFormats);
}
TEST(glSharingBasicTest, givenNullNumImageFormatsWhenGettingSupportedFormatsThenNumFormatsIsNotDereferenced) {
@@ -1304,6 +1304,6 @@ TEST_F(clGetSupportedGLTextureFormatsINTELTests, givenValidInputsWhenGettingForm
EXPECT_NE(0u, numFormats);
for (uint32_t i = 0; i < glFormatsCount; i++) {
EXPECT_NE(GlSharing::gLToCLFormats.end(), GlSharing::gLToCLFormats.find(glFormats[i]));
EXPECT_NE(GlSharing::glToCLFormats.end(), GlSharing::glToCLFormats.find(glFormats[i]));
}
}