Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extract gl mocks to windows directory 

Change-Id: I963032bfad880e42100f6233b9570cefb607f26c
This commit is contained in:
Maciej Dziuban 2020-01-20 14:35:51 +01:00 committed by sys_ocldev
parent 054f2b503a
commit 3c27e97c43
20 changed files with 79 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
unit_tests/api/gl/cl_create_from_gl_texture_tests.cpp
View File

@ -1,12 +1,13 @@
/*
* Copyright (C) 2018-2019 Intel Corporation
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "unit_tests/api/cl_api_tests.h"
#include "unit_tests/mocks/gl/mock_gl_sharing.h"
#include <GL/gl.h>
using namespace NEO;

10
unit_tests/command_queue/gl/CMakeLists.txt
View File

@ -1,13 +1,7 @@
#
# Copyright (C) 2017-2018 Intel Corporation
# Copyright (C) 2017-2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
if(WIN32)
set(IGDRCL_SRCS_tests_command_queue_gl
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_gl_tests.cpp
)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_command_queue_gl})
endif()
add_subdirectories()

13
unit_tests/command_queue/gl/windows/CMakeLists.txt Normal file
View File

@ -0,0 +1,13 @@
#
# Copyright (C) 2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
if(WIN32)
set(IGDRCL_SRCS_tests_command_queue_gl_windows
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_gl_tests_windows.cpp
)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_command_queue_gl_windows})
endif()

2
unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp → unit_tests/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp
View File

@ -14,7 +14,7 @@
#include "unit_tests/fixtures/hello_world_fixture.h"
#include "unit_tests/fixtures/memory_management_fixture.h"
#include "unit_tests/helpers/hw_parse.h"
#include "unit_tests/mocks/gl/mock_gl_sharing.h"
#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
#include "unit_tests/mocks/mock_buffer.h"
#include "unit_tests/mocks/mock_csr.h"
#include "unit_tests/mocks/mock_submissions_aggregator.h"

7
unit_tests/mock_gl/CMakeLists.txt Normal file
View File

@ -0,0 +1,7 @@
#
# Copyright (C) 2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
add_subdirectories()

21
unit_tests/mock_gl/windows/CMakeLists.txt Normal file
View File

@ -0,0 +1,21 @@
#
# Copyright (C) 2017-2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
if(WIN32)
set(IGDRCL_SRCS_mock_opengl32
${CMAKE_CURRENT_SOURCE_DIR}/mock_opengl32.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_opengl32.def
${NEO_SOURCE_DIR}/unit_tests/helpers/windows/mock_function.cpp
)
add_library(mock_opengl32 SHARED ${IGDRCL_SRCS_mock_opengl32})
add_dependencies(unit_tests mock_opengl32)
add_dependencies(igdrcl_tests mock_opengl32)
set_target_properties(mock_opengl32 PROPERTIES FOLDER "test mocks")
target_include_directories(mock_opengl32 PRIVATE $<TARGET_PROPERTY:${NEO_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
target_compile_definitions(mock_opengl32 PRIVATE $<TARGET_PROPERTY:${NEO_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
endif()

4
unit_tests/mocks/gl/mock_opengl32.cpp → unit_tests/mock_gl/windows/mock_opengl32.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2019 Intel Corporation
* Copyright (C) 2018-2020 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -8,7 +8,7 @@
#define _GDI32_ //It causes that definitions of functions are not loaded from dll in file wingdi.h because they are in this file.
#include "unit_tests/helpers/windows/mock_function.h"
#include "unit_tests/mocks/gl/mock_gl_sharing.h"
#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
#include "GL/gl.h"

2
unit_tests/mocks/gl/mock_opengl32.def → unit_tests/mock_gl/windows/mock_opengl32.def
View File

@ -1,4 +1,4 @@
; Copyright (c) 2017, Intel Corporation
; Copyright (c) 2017-2020, Intel Corporation
;
; Permission is hereby granted, free of charge, to any person obtaining a
; copy of this software and associated documentation files (the "Software"),

3
unit_tests/mocks/CMakeLists.txt
View File

@ -102,9 +102,8 @@ else()
)
endif()
add_subdirectories()
add_library(igdrcl_mocks STATIC EXCLUDE_FROM_ALL ${IGDRCL_SRCS_tests_mocks})
add_subdirectories()
if(WIN32)
target_include_directories(igdrcl_mocks PUBLIC

26
unit_tests/mocks/gl/CMakeLists.txt
View File

@ -1,29 +1,7 @@
#
# Copyright (C) 2017-2019 Intel Corporation
# Copyright (C) 2017-2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
if(WIN32)
list (APPEND IGDRCL_SRCS_tests_mocks
${CMAKE_CURRENT_SOURCE_DIR}/mock_gl_sharing.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_gl_sharing.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_gl_arb_sync_event.h
)
set(IGDRCL_SRCS_tests_mocks "${IGDRCL_SRCS_tests_mocks}" PARENT_SCOPE)
set(IGDRCL_SRCS_mock_opengl32
${CMAKE_CURRENT_SOURCE_DIR}/mock_opengl32.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_opengl32.def
${NEO_SOURCE_DIR}/unit_tests/helpers/windows/mock_function.cpp
)
add_library(mock_opengl32 SHARED ${IGDRCL_SRCS_mock_opengl32})
add_dependencies(unit_tests mock_opengl32)
add_dependencies(igdrcl_tests mock_opengl32)
set_target_properties(mock_opengl32 PROPERTIES FOLDER "test mocks")
target_include_directories(mock_opengl32 PRIVATE $<TARGET_PROPERTY:${NEO_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
target_compile_definitions(mock_opengl32 PRIVATE $<TARGET_PROPERTY:${NEO_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
endif()
add_subdirectories()

16
unit_tests/mocks/gl/windows/CMakeLists.txt Normal file
View File

@ -0,0 +1,16 @@
#
# Copyright (C) 2017-2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
if(WIN32)
list (APPEND IGDRCL_SRCS_tests_mocks_windows
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/mock_gl_arb_sync_event_windows.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_gl_sharing_windows.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_gl_sharing_windows.h
)
target_sources(igdrcl_mocks PRIVATE ${IGDRCL_SRCS_tests_mocks_windows})
endif()

2
unit_tests/mocks/gl/mock_gl_arb_sync_event.h → unit_tests/mocks/gl/windows/mock_gl_arb_sync_event_windows.h
View File

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

2
unit_tests/mocks/gl/mock_gl_sharing.cpp → unit_tests/mocks/gl/windows/mock_gl_sharing_windows.cpp
View File

@ -5,7 +5,7 @@
*
*/
#include "unit_tests/mocks/gl/mock_gl_sharing.h"
#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
#include "config.h"

0
unit_tests/mocks/gl/mock_gl_sharing.h → unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h
View File

2
unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp
View File

@ -15,7 +15,7 @@
#include "runtime/os_interface/windows/wddm_memory_operations_handler.h"
#include "runtime/sharings/gl/gl_arb_sync_event.h"
#include "runtime/sharings/gl/windows/gl_sharing.h"
#include "unit_tests/mocks/gl/mock_gl_sharing.h"
#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
#include "unit_tests/mocks/mock_execution_environment.h"
#include "unit_tests/os_interface/windows/wddm_fixture.h"

4
unit_tests/sharings/gl/windows/gl_arb_sync_event_tests.cpp
View File

@ -13,8 +13,8 @@
#include "runtime/sharings/gl/gl_arb_sync_event.h"
#include "runtime/sharings/sharing.h"
#include "test.h"
#include "unit_tests/mocks/gl/mock_gl_arb_sync_event.h"
#include "unit_tests/mocks/gl/mock_gl_sharing.h"
#include "unit_tests/mocks/gl/windows/mock_gl_arb_sync_event_windows.h"
#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
#include "unit_tests/mocks/mock_command_queue.h"
#include "unit_tests/mocks/mock_context.h"
#include "unit_tests/mocks/mock_csr.h"

2
unit_tests/sharings/gl/windows/gl_create_from_texture_tests.cpp
View File

@ -12,7 +12,7 @@
#include "test.h"
#include "unit_tests/libult/create_command_stream.h"
#include "unit_tests/libult/ult_command_stream_receiver.h"
#include "unit_tests/mocks/gl/mock_gl_sharing.h"
#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
#include "unit_tests/mocks/mock_context.h"
#include "unit_tests/mocks/mock_execution_environment.h"
#include "unit_tests/mocks/mock_gmm.h"

2
unit_tests/sharings/gl/windows/gl_reused_buffers_tests.cpp
View File

@ -10,7 +10,7 @@
#include "runtime/mem_obj/buffer.h"
#include "runtime/sharings/gl/gl_buffer.h"
#include "test.h"
#include "unit_tests/mocks/gl/mock_gl_sharing.h"
#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
#include "unit_tests/mocks/mock_context.h"
#include "unit_tests/mocks/mock_memory_manager.h"

4
unit_tests/sharings/gl/windows/gl_sharing_tests.cpp
View File

@ -26,8 +26,8 @@
#include "test.h"
#include "unit_tests/libult/create_command_stream.h"
#include "unit_tests/libult/ult_command_stream_receiver.h"
#include "unit_tests/mocks/gl/mock_gl_arb_sync_event.h"
#include "unit_tests/mocks/gl/mock_gl_sharing.h"
#include "unit_tests/mocks/gl/windows/mock_gl_arb_sync_event_windows.h"
#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
#include "unit_tests/mocks/mock_async_event_handler.h"
#include "unit_tests/mocks/mock_command_queue.h"
#include "unit_tests/mocks/mock_context.h"

2
unit_tests/sharings/gl/windows/gl_texture_tests.cpp
View File

@ -11,7 +11,7 @@
#include "runtime/sharings/gl/gl_texture.h"
#include "unit_tests/libult/create_command_stream.h"
#include "unit_tests/libult/ult_command_stream_receiver.h"
#include "unit_tests/mocks/gl/mock_gl_sharing.h"
#include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h"
#include "unit_tests/mocks/mock_context.h"
#include "unit_tests/mocks/mock_gmm.h"
#include "unit_tests/mocks/mock_memory_manager.h"