id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-05-31 00:41:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed OpenGL code from CMakeLists.txt

Browse source
This commit is contained in:
Robert Beckebans 2024-02-25 21:08:27 +01:00
parent 3082be4a46
commit ac5dfb8cfe
4 changed files with 4 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

17
neo/CMakeLists.txt
View file

@ -499,12 +499,6 @@ file(GLOB RENDERER_PASSES_SOURCES renderer/Passes/*.cpp)
file(GLOB RENDERER_SMAA_INCLUDES renderer/SMAA/*.h) file(GLOB RENDERER_SMAA_INCLUDES renderer/SMAA/*.h)
file(GLOB RENDERER_OPENGL_INCLUDES renderer/OpenGL/*.h)
file(GLOB RENDERER_OPENGL_SOURCES renderer/OpenGL/*.cpp)
file(GLOB RENDERER_VULKAN_INCLUDES renderer/Vulkan/*.h)
file(GLOB RENDERER_VULKAN_SOURCES renderer/Vulkan/*.cpp)
file(GLOB RENDERER_NVRHI_INCLUDES renderer/NVRHI/*.h) file(GLOB RENDERER_NVRHI_INCLUDES renderer/NVRHI/*.h)
file(GLOB RENDERER_NVRHI_SOURCES renderer/NVRHI/*.cpp) file(GLOB RENDERER_NVRHI_SOURCES renderer/NVRHI/*.cpp)
@ -1100,15 +1094,9 @@ source_group("renderer\\Passes" FILES ${RENDERER_PASSES_SOURCES})
source_group("renderer\\DXT" FILES ${RENDERER_DXT_INCLUDES}) source_group("renderer\\DXT" FILES ${RENDERER_DXT_INCLUDES})
source_group("renderer\\DXT" FILES ${RENDERER_DXT_SOURCES}) source_group("renderer\\DXT" FILES ${RENDERER_DXT_SOURCES})
source_group("renderer\\OpenGL" FILES ${RENDERER_OPENGL_INCLUDES})
source_group("renderer\\OpenGL" FILES ${RENDERER_OPENGL_SOURCES})
source_group("renderer\\NVRHI" FILES ${RENDERER_NVRHI_INCLUDES}) source_group("renderer\\NVRHI" FILES ${RENDERER_NVRHI_INCLUDES})
source_group("renderer\\NVRHI" FILES ${RENDERER_NVRHI_SOURCES}) source_group("renderer\\NVRHI" FILES ${RENDERER_NVRHI_SOURCES})
source_group("renderer\\Vulkan" FILES ${RENDERER_VULKAN_INCLUDES})
source_group("renderer\\Vulkan" FILES ${RENDERER_VULKAN_SOURCES})
source_group("renderer\\SMAA" FILES ${RENDERER_SMAA_INCLUDES}) source_group("renderer\\SMAA" FILES ${RENDERER_SMAA_INCLUDES})
source_group("libs\\irrxml" FILES ${IRRXML_INCLUDES}) source_group("libs\\irrxml" FILES ${IRRXML_INCLUDES})
@ -1434,11 +1422,6 @@ if(MSVC)
if(USE_DX12) if(USE_DX12)
list(APPEND RBDOOM3_INCLUDES ${RENDERER_NVRHI_INCLUDES}) list(APPEND RBDOOM3_INCLUDES ${RENDERER_NVRHI_INCLUDES})
list(APPEND RBDOOM3_SOURCES ${RENDERER_NVRHI_SOURCES}) list(APPEND RBDOOM3_SOURCES ${RENDERER_NVRHI_SOURCES})
# RB: TODO REMOVE
set(OpenGL_LIBRARIES
opengl32
glu32)
endif() endif()
if(OPENAL) if(OPENAL)

4
neo/renderer/NVRHI/RenderProgs_NVRHI.cpp
View file

@ -91,7 +91,7 @@ extern DeviceManager* deviceManager;
/* /*
================================================================================================ ================================================================================================
createShaderPermutation createShaderPermutation
* Copyright (c) 2014-2021, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2014-2021, NVIDIA CORPORATION. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
@ -115,7 +115,7 @@ extern DeviceManager* deviceManager;
================================================================================================ ================================================================================================
*/ */
nvrhi::ShaderHandle createShaderPermutation( nvrhi::IDevice* device, const nvrhi::ShaderDesc& d, const void* blob, size_t blobSize, nvrhi::ShaderHandle createShaderPermutation( nvrhi::IDevice* device, const nvrhi::ShaderDesc& d, const void* blob, size_t blobSize,
const ShaderMake::ShaderConstant* constants, uint32_t numConstants, bool errorIfNotFound = true ) const ShaderMake::ShaderConstant* constants, uint32_t numConstants, bool errorIfNotFound = true )
{ {
const void* binary = nullptr; const void* binary = nullptr;
size_t binarySize = 0; size_t binarySize = 0;

2
neo/renderer/RenderBackend.cpp
View file

@ -5,7 +5,7 @@ Doom 3 BFG Edition GPL Source Code
Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company. Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company.
Copyright (C) 2014 Carl Kenner Copyright (C) 2014 Carl Kenner
Copyright (C) 2016-2017 Dustin Land Copyright (C) 2016-2017 Dustin Land
Copyright (C) 2013-2023 Robert Beckebans Copyright (C) 2013-2024 Robert Beckebans
Copyright (C) 2022 Stephen Pridham Copyright (C) 2022 Stephen Pridham
This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code"). This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code").

2
neo/renderer/RenderSystem_init.cpp
View file

@ -3,7 +3,7 @@
Doom 3 BFG Edition GPL Source Code Doom 3 BFG Edition GPL Source Code
Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company. Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company.
Copyright (C) 2014-2021 Robert Beckebans Copyright (C) 2014-2024 Robert Beckebans
Copyright (C) 2014-2016 Kot in Action Creative Artel Copyright (C) 2014-2016 Kot in Action Creative Artel
Copyright (C) 2022 Stephen Pridham Copyright (C) 2022 Stephen Pridham