diff --git a/runtime/os_interface/windows/gl/gl_arb_sync_event_os.cpp b/runtime/os_interface/windows/gl/gl_arb_sync_event_os.cpp index af24a6c245..0035048c93 100644 --- a/runtime/os_interface/windows/gl/gl_arb_sync_event_os.cpp +++ b/runtime/os_interface/windows/gl/gl_arb_sync_event_os.cpp @@ -15,7 +15,7 @@ #include "runtime/os_interface/windows/os_interface.h" #include "runtime/os_interface/windows/wddm/wddm.h" #include "runtime/sharings/gl/gl_arb_sync_event.h" -#include "runtime/sharings/gl/windows/gl_sharing.h" +#include "runtime/sharings/gl/windows/gl_sharing_windows.h" #include diff --git a/runtime/os_interface/windows/gl/gl_sharing_win.cpp b/runtime/os_interface/windows/gl/gl_sharing_win.cpp index 740ead5c0a..e8b293e064 100644 --- a/runtime/os_interface/windows/gl/gl_sharing_win.cpp +++ b/runtime/os_interface/windows/gl/gl_sharing_win.cpp @@ -9,7 +9,7 @@ #include "runtime/helpers/timestamp_packet.h" #include "runtime/helpers/windows/gl_helper.h" #include "runtime/sharings/gl/gl_arb_sync_event.h" -#include "runtime/sharings/gl/windows/gl_sharing.h" +#include "runtime/sharings/gl/windows/gl_sharing_windows.h" #include #include diff --git a/runtime/sharings/gl/windows/CMakeLists.txt b/runtime/sharings/gl/windows/CMakeLists.txt index 1967b2487b..cfcb566596 100644 --- a/runtime/sharings/gl/windows/CMakeLists.txt +++ b/runtime/sharings/gl/windows/CMakeLists.txt @@ -8,13 +8,13 @@ if(WIN32) set(RUNTIME_SRCS_SHARINGS_GL_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/cl_gl_api.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/gl_arb_sync_event.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/gl_buffer.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/gl_context_guard.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/gl_sharing.h - ${CMAKE_CURRENT_SOURCE_DIR}/gl_sharing.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/gl_sync_event.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/gl_texture.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/gl_arb_sync_event_windows.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/gl_buffer_windows.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/gl_context_guard_windows.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/gl_sharing_windows.h + ${CMAKE_CURRENT_SOURCE_DIR}/gl_sharing_windows.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/gl_sync_event_windows.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/gl_texture_windows.cpp ${CMAKE_CURRENT_SOURCE_DIR}/win_enable_gl.h ) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SHARINGS_GL_WINDOWS}) diff --git a/runtime/sharings/gl/windows/cl_gl_api.cpp b/runtime/sharings/gl/windows/cl_gl_api.cpp index 1eb731ecb1..7c6559be26 100644 --- a/runtime/sharings/gl/windows/cl_gl_api.cpp +++ b/runtime/sharings/gl/windows/cl_gl_api.cpp @@ -21,7 +21,7 @@ #include "runtime/sharings/gl/gl_buffer.h" #include "runtime/sharings/gl/gl_sync_event.h" #include "runtime/sharings/gl/gl_texture.h" -#include "runtime/sharings/gl/windows/gl_sharing.h" +#include "runtime/sharings/gl/windows/gl_sharing_windows.h" #include "runtime/tracing/tracing_notify.h" #include "CL/cl.h" diff --git a/runtime/sharings/gl/windows/gl_arb_sync_event.cpp b/runtime/sharings/gl/windows/gl_arb_sync_event_windows.cpp similarity index 98% rename from runtime/sharings/gl/windows/gl_arb_sync_event.cpp rename to runtime/sharings/gl/windows/gl_arb_sync_event_windows.cpp index 8dab3e61f0..975af23a07 100644 --- a/runtime/sharings/gl/windows/gl_arb_sync_event.cpp +++ b/runtime/sharings/gl/windows/gl_arb_sync_event_windows.cpp @@ -5,15 +5,14 @@ * */ -#include "runtime/sharings/gl/gl_arb_sync_event.h" - #include "public/cl_gl_private_intel.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/context/context.h" #include "runtime/device/device.h" #include "runtime/helpers/base_object.h" -#include "runtime/sharings/gl/windows/gl_sharing.h" +#include "runtime/sharings/gl/gl_arb_sync_event.h" +#include "runtime/sharings/gl/windows/gl_sharing_windows.h" #include diff --git a/runtime/sharings/gl/windows/gl_buffer.cpp b/runtime/sharings/gl/windows/gl_buffer_windows.cpp similarity index 99% rename from runtime/sharings/gl/windows/gl_buffer.cpp rename to runtime/sharings/gl/windows/gl_buffer_windows.cpp index be727cb5bc..2a45908196 100644 --- a/runtime/sharings/gl/windows/gl_buffer.cpp +++ b/runtime/sharings/gl/windows/gl_buffer_windows.cpp @@ -5,18 +5,17 @@ * */ -#include "runtime/sharings/gl/gl_buffer.h" - // clang-format off #include "public/cl_gl_private_intel.h" // clang-format on #include "core/gmm_helper/gmm.h" +#include "runtime/sharings/gl/gl_buffer.h" #include "runtime/context/context.h" #include "runtime/device/device.h" #include "runtime/helpers/get_info.h" #include "runtime/mem_obj/buffer.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/sharings/gl/windows/gl_sharing.h" +#include "runtime/sharings/gl/windows/gl_sharing_windows.h" #include "config.h" diff --git a/runtime/sharings/gl/windows/gl_context_guard.cpp b/runtime/sharings/gl/windows/gl_context_guard_windows.cpp similarity index 95% rename from runtime/sharings/gl/windows/gl_context_guard.cpp rename to runtime/sharings/gl/windows/gl_context_guard_windows.cpp index bff17a5c11..e2cbaab983 100644 --- a/runtime/sharings/gl/windows/gl_context_guard.cpp +++ b/runtime/sharings/gl/windows/gl_context_guard_windows.cpp @@ -6,8 +6,7 @@ */ #include "runtime/sharings/gl/gl_context_guard.h" - -#include "runtime/sharings/gl/windows/gl_sharing.h" +#include "runtime/sharings/gl/windows/gl_sharing_windows.h" namespace NEO { GLContextGuard::GLContextGuard(GLSharingFunctions &sharingFcns) : sharingFunctions(&sharingFcns) { diff --git a/runtime/sharings/gl/windows/gl_sharing.cpp b/runtime/sharings/gl/windows/gl_sharing_windows.cpp similarity index 98% rename from runtime/sharings/gl/windows/gl_sharing.cpp rename to runtime/sharings/gl/windows/gl_sharing_windows.cpp index 556e908cf5..b3560e6191 100644 --- a/runtime/sharings/gl/windows/gl_sharing.cpp +++ b/runtime/sharings/gl/windows/gl_sharing_windows.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/sharings/gl/windows/gl_sharing.h" +#include "runtime/sharings/gl/windows/gl_sharing_windows.h" #include "runtime/context/context.inl" #include "runtime/helpers/windows/gl_helper.h" diff --git a/runtime/sharings/gl/windows/gl_sharing.h b/runtime/sharings/gl/windows/gl_sharing_windows.h similarity index 100% rename from runtime/sharings/gl/windows/gl_sharing.h rename to runtime/sharings/gl/windows/gl_sharing_windows.h diff --git a/runtime/sharings/gl/windows/gl_sync_event.cpp b/runtime/sharings/gl/windows/gl_sync_event_windows.cpp similarity index 97% rename from runtime/sharings/gl/windows/gl_sync_event.cpp rename to runtime/sharings/gl/windows/gl_sync_event_windows.cpp index 59ecb08ecb..83ba06aeea 100644 --- a/runtime/sharings/gl/windows/gl_sync_event.cpp +++ b/runtime/sharings/gl/windows/gl_sync_event_windows.cpp @@ -5,8 +5,6 @@ * */ -#include "runtime/sharings/gl/gl_sync_event.h" - #include "public/cl_gl_private_intel.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/context/context.h" @@ -17,7 +15,8 @@ #include "runtime/helpers/timestamp_packet.h" #include "runtime/platform/platform.h" #include "runtime/sharings/gl/gl_context_guard.h" -#include "runtime/sharings/gl/windows/gl_sharing.h" +#include "runtime/sharings/gl/gl_sync_event.h" +#include "runtime/sharings/gl/windows/gl_sharing_windows.h" namespace NEO { GlSyncEvent::GlSyncEvent(Context &context, const GL_CL_SYNC_INFO &sync) diff --git a/runtime/sharings/gl/windows/gl_texture.cpp b/runtime/sharings/gl/windows/gl_texture_windows.cpp similarity index 99% rename from runtime/sharings/gl/windows/gl_texture.cpp rename to runtime/sharings/gl/windows/gl_texture_windows.cpp index 432477374e..6f02543311 100644 --- a/runtime/sharings/gl/windows/gl_texture.cpp +++ b/runtime/sharings/gl/windows/gl_texture_windows.cpp @@ -5,8 +5,6 @@ * */ -#include "runtime/sharings/gl/gl_texture.h" - #include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" #include "core/gmm_helper/resource_info.h" @@ -19,7 +17,8 @@ #include "runtime/helpers/get_info.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/sharings/gl/windows/gl_sharing.h" +#include "runtime/sharings/gl/gl_texture.h" +#include "runtime/sharings/gl/windows/gl_sharing_windows.h" #include "CL/cl_gl.h" #include "config.h" diff --git a/runtime/sharings/gl/windows/win_enable_gl.cpp b/runtime/sharings/gl/windows/win_enable_gl.cpp index e85a701ce1..b04e3e09df 100644 --- a/runtime/sharings/gl/windows/win_enable_gl.cpp +++ b/runtime/sharings/gl/windows/win_enable_gl.cpp @@ -11,7 +11,7 @@ #include "runtime/context/context.h" #include "runtime/context/context.inl" #include "runtime/sharings/gl/cl_gl_api_intel.h" -#include "runtime/sharings/gl/windows/gl_sharing.h" +#include "runtime/sharings/gl/windows/gl_sharing_windows.h" #include "runtime/sharings/sharing_factory.h" #include "runtime/sharings/sharing_factory.inl" diff --git a/runtime/sharings/gl/windows/win_enable_gl.h b/runtime/sharings/gl/windows/win_enable_gl.h index aaa0f6b78c..b9880d2f2c 100644 --- a/runtime/sharings/gl/windows/win_enable_gl.h +++ b/runtime/sharings/gl/windows/win_enable_gl.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/sharings/gl/windows/gl_sharing.h" +#include "runtime/sharings/gl/windows/gl_sharing_windows.h" #include "runtime/sharings/sharing_factory.h" #include diff --git a/unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h b/unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h index 5e47dadebe..01794a5fdd 100644 --- a/unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h +++ b/unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h @@ -7,7 +7,7 @@ #pragma once #include "public/cl_gl_private_intel.h" -#include "runtime/sharings/gl/windows/gl_sharing.h" +#include "runtime/sharings/gl/windows/gl_sharing_windows.h" #include "unit_tests/os_interface/windows/gl/gl_dll_helper.h" #include "config.h" diff --git a/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp b/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp index 8bf413844a..66388cac08 100644 --- a/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp +++ b/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp @@ -14,7 +14,7 @@ #include "runtime/os_interface/windows/wddm/wddm.h" #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 "runtime/sharings/gl/windows/gl_sharing_windows.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" diff --git a/unit_tests/sharings/gl/windows/gl_sharing_tests.cpp b/unit_tests/sharings/gl/windows/gl_sharing_tests.cpp index c626d4a766..4d25e20331 100644 --- a/unit_tests/sharings/gl/windows/gl_sharing_tests.cpp +++ b/unit_tests/sharings/gl/windows/gl_sharing_tests.cpp @@ -21,7 +21,7 @@ #include "runtime/sharings/gl/gl_context_guard.h" #include "runtime/sharings/gl/gl_sync_event.h" #include "runtime/sharings/gl/gl_texture.h" -#include "runtime/sharings/gl/windows/gl_sharing.h" +#include "runtime/sharings/gl/windows/gl_sharing_windows.h" #include "runtime/sharings/sharing.h" #include "test.h" #include "unit_tests/libult/create_command_stream.h"