Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Examples/Complete/Simple/Desktop/Main.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Fusee.Base.Imp.Desktop;
using Fusee.Engine.Core;
using Fusee.Engine.Core.Scene;
using Fusee.Engine.Imp.Graphics.Desktop;
using Fusee.Serialization;
using System.IO;
using System.Reflection;
Expand Down Expand Up @@ -53,6 +54,8 @@ public static void Main()

AssetStorage.RegisterProvider(fap);

NvidiaDedicatedGpuEnabler.InitializeDedicatedGraphics();

var app = new Core.Simple();

// Inject Fusee.Engine InjectMe dependencies (hard coded)
Expand Down
40 changes: 5 additions & 35 deletions Fusee.sln
Original file line number Diff line number Diff line change
Expand Up @@ -283,12 +283,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fusee.Examples.Deferred.Cor
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fusee.Examples.Deferred.Android", "Examples\Complete\Deferred\Android\Fusee.Examples.Deferred.Android.csproj", "{C29B4190-69CD-49EE-9884-52C84F0451BA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{594F2025-8C23-40D2-8100-C9989CA16DC9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fusee.Tools.Build.Blazorpatch", "src\Tools\Build\Blazorpatch\Fusee.Tools.Build.Blazorpatch.csproj", "{8CF98098-64E7-421B-9CBF-67E02EDE6D32}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fusee.Tools.Build.Versionupdate", "src\Tools\Build\Versionupdate\Fusee.Tools.Build.Versionupdate.csproj", "{59693479-2561-45B0-BB9E-10337CA9DF5C}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Engine\Imp\Graphics\Shared\Fusee.Engine.Imp.Graphics.Shared.projitems*{253263c9-9c67-44a5-94d3-51c586bbdaec}*SharedItemsImports = 13
Expand Down Expand Up @@ -1288,6 +1282,7 @@ Global
{2ED181F9-CB01-4514-8045-4CD9D505D100}.Release|Any CPU.Build.0 = Release|Any CPU
{2ED181F9-CB01-4514-8045-4CD9D505D100}.Release-Android|Any CPU.ActiveCfg = Release|Any CPU
{2ED181F9-CB01-4514-8045-4CD9D505D100}.Release-Blazor|Any CPU.ActiveCfg = Release|Any CPU
{2ED181F9-CB01-4514-8045-4CD9D505D100}.Release-Blazor|Any CPU.Build.0 = Release|Any CPU
{2ED181F9-CB01-4514-8045-4CD9D505D100}.Release-Desktop|Any CPU.ActiveCfg = Release|Any CPU
{2ED181F9-CB01-4514-8045-4CD9D505D100}.Release-Desktop|Any CPU.Build.0 = Release|Any CPU
{2ED181F9-CB01-4514-8045-4CD9D505D100}.Release-NuGet|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -1301,6 +1296,7 @@ Global
{7E31E348-3A10-4C7E-892D-C6244A1AF20B}.Release|Any CPU.Build.0 = Release|Any CPU
{7E31E348-3A10-4C7E-892D-C6244A1AF20B}.Release-Android|Any CPU.ActiveCfg = Release|Any CPU
{7E31E348-3A10-4C7E-892D-C6244A1AF20B}.Release-Blazor|Any CPU.ActiveCfg = Release|Any CPU
{7E31E348-3A10-4C7E-892D-C6244A1AF20B}.Release-Blazor|Any CPU.Build.0 = Release|Any CPU
{7E31E348-3A10-4C7E-892D-C6244A1AF20B}.Release-Desktop|Any CPU.ActiveCfg = Release|Any CPU
{7E31E348-3A10-4C7E-892D-C6244A1AF20B}.Release-Desktop|Any CPU.Build.0 = Release|Any CPU
{7E31E348-3A10-4C7E-892D-C6244A1AF20B}.Release-NuGet|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -1314,6 +1310,7 @@ Global
{AA302AC4-C9E2-42BC-BAA5-2C9E8F29D544}.Release|Any CPU.Build.0 = Release|Any CPU
{AA302AC4-C9E2-42BC-BAA5-2C9E8F29D544}.Release-Android|Any CPU.ActiveCfg = Release|Any CPU
{AA302AC4-C9E2-42BC-BAA5-2C9E8F29D544}.Release-Blazor|Any CPU.ActiveCfg = Release|Any CPU
{AA302AC4-C9E2-42BC-BAA5-2C9E8F29D544}.Release-Blazor|Any CPU.Build.0 = Release|Any CPU
{AA302AC4-C9E2-42BC-BAA5-2C9E8F29D544}.Release-Desktop|Any CPU.ActiveCfg = Release|Any CPU
{AA302AC4-C9E2-42BC-BAA5-2C9E8F29D544}.Release-Desktop|Any CPU.Build.0 = Release|Any CPU
{AA302AC4-C9E2-42BC-BAA5-2C9E8F29D544}.Release-NuGet|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -1327,6 +1324,7 @@ Global
{7912EC07-2B08-48E1-A5CD-5E57EB03375F}.Release|Any CPU.Build.0 = Release|Any CPU
{7912EC07-2B08-48E1-A5CD-5E57EB03375F}.Release-Android|Any CPU.ActiveCfg = Release|Any CPU
{7912EC07-2B08-48E1-A5CD-5E57EB03375F}.Release-Blazor|Any CPU.ActiveCfg = Release|Any CPU
{7912EC07-2B08-48E1-A5CD-5E57EB03375F}.Release-Blazor|Any CPU.Build.0 = Release|Any CPU
{7912EC07-2B08-48E1-A5CD-5E57EB03375F}.Release-Desktop|Any CPU.ActiveCfg = Release|Any CPU
{7912EC07-2B08-48E1-A5CD-5E57EB03375F}.Release-Desktop|Any CPU.Build.0 = Release|Any CPU
{7912EC07-2B08-48E1-A5CD-5E57EB03375F}.Release-NuGet|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -1349,6 +1347,7 @@ Global
{F971051F-B756-4509-849D-C737BA9E4B0F}.Release|Any CPU.Build.0 = Release|Any CPU
{F971051F-B756-4509-849D-C737BA9E4B0F}.Release-Android|Any CPU.ActiveCfg = Release|Any CPU
{F971051F-B756-4509-849D-C737BA9E4B0F}.Release-Blazor|Any CPU.ActiveCfg = Release|Any CPU
{F971051F-B756-4509-849D-C737BA9E4B0F}.Release-Blazor|Any CPU.Build.0 = Release|Any CPU
{F971051F-B756-4509-849D-C737BA9E4B0F}.Release-Desktop|Any CPU.ActiveCfg = Release|Any CPU
{F971051F-B756-4509-849D-C737BA9E4B0F}.Release-Desktop|Any CPU.Build.0 = Release|Any CPU
{F971051F-B756-4509-849D-C737BA9E4B0F}.Release-NuGet|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -1641,32 +1640,6 @@ Global
{C29B4190-69CD-49EE-9884-52C84F0451BA}.Release-Blazor|Any CPU.ActiveCfg = Release|Any CPU
{C29B4190-69CD-49EE-9884-52C84F0451BA}.Release-Desktop|Any CPU.ActiveCfg = Release|Any CPU
{C29B4190-69CD-49EE-9884-52C84F0451BA}.Release-NuGet|Any CPU.ActiveCfg = Release|Any CPU
{8CF98098-64E7-421B-9CBF-67E02EDE6D32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8CF98098-64E7-421B-9CBF-67E02EDE6D32}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8CF98098-64E7-421B-9CBF-67E02EDE6D32}.Debug-Android|Any CPU.ActiveCfg = Debug|Any CPU
{8CF98098-64E7-421B-9CBF-67E02EDE6D32}.Debug-Blazor|Any CPU.ActiveCfg = Debug|Any CPU
{8CF98098-64E7-421B-9CBF-67E02EDE6D32}.Debug-Blazor|Any CPU.Build.0 = Debug|Any CPU
{8CF98098-64E7-421B-9CBF-67E02EDE6D32}.Debug-Desktop|Any CPU.ActiveCfg = Debug|Any CPU
{8CF98098-64E7-421B-9CBF-67E02EDE6D32}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8CF98098-64E7-421B-9CBF-67E02EDE6D32}.Release|Any CPU.Build.0 = Release|Any CPU
{8CF98098-64E7-421B-9CBF-67E02EDE6D32}.Release-Android|Any CPU.ActiveCfg = Release|Any CPU
{8CF98098-64E7-421B-9CBF-67E02EDE6D32}.Release-Blazor|Any CPU.ActiveCfg = Release|Any CPU
{8CF98098-64E7-421B-9CBF-67E02EDE6D32}.Release-Blazor|Any CPU.Build.0 = Release|Any CPU
{8CF98098-64E7-421B-9CBF-67E02EDE6D32}.Release-Desktop|Any CPU.ActiveCfg = Release|Any CPU
{8CF98098-64E7-421B-9CBF-67E02EDE6D32}.Release-NuGet|Any CPU.ActiveCfg = Release|Any CPU
{8CF98098-64E7-421B-9CBF-67E02EDE6D32}.Release-NuGet|Any CPU.Build.0 = Release|Any CPU
{59693479-2561-45B0-BB9E-10337CA9DF5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{59693479-2561-45B0-BB9E-10337CA9DF5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59693479-2561-45B0-BB9E-10337CA9DF5C}.Debug-Android|Any CPU.ActiveCfg = Debug|Any CPU
{59693479-2561-45B0-BB9E-10337CA9DF5C}.Debug-Blazor|Any CPU.ActiveCfg = Debug|Any CPU
{59693479-2561-45B0-BB9E-10337CA9DF5C}.Debug-Desktop|Any CPU.ActiveCfg = Debug|Any CPU
{59693479-2561-45B0-BB9E-10337CA9DF5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{59693479-2561-45B0-BB9E-10337CA9DF5C}.Release|Any CPU.Build.0 = Release|Any CPU
{59693479-2561-45B0-BB9E-10337CA9DF5C}.Release-Android|Any CPU.ActiveCfg = Release|Any CPU
{59693479-2561-45B0-BB9E-10337CA9DF5C}.Release-Blazor|Any CPU.ActiveCfg = Release|Any CPU
{59693479-2561-45B0-BB9E-10337CA9DF5C}.Release-Desktop|Any CPU.ActiveCfg = Release|Any CPU
{59693479-2561-45B0-BB9E-10337CA9DF5C}.Release-NuGet|Any CPU.ActiveCfg = Release|Any CPU
{59693479-2561-45B0-BB9E-10337CA9DF5C}.Release-NuGet|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1793,9 +1766,6 @@ Global
{CA05A0E8-1938-4352-984D-33AA369CD680} = {E7E4600F-D815-49F6-B79C-C456C87F01DC}
{D445D0EB-406C-4CAE-8D0A-68D96FD6E23F} = {E7E4600F-D815-49F6-B79C-C456C87F01DC}
{C29B4190-69CD-49EE-9884-52C84F0451BA} = {E7E4600F-D815-49F6-B79C-C456C87F01DC}
{594F2025-8C23-40D2-8100-C9989CA16DC9} = {0C344D5F-BE70-4828-B95A-1D313B894BC3}
{8CF98098-64E7-421B-9CBF-67E02EDE6D32} = {594F2025-8C23-40D2-8100-C9989CA16DC9}
{59693479-2561-45B0-BB9E-10337CA9DF5C} = {594F2025-8C23-40D2-8100-C9989CA16DC9}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {CC1775C2-579F-4897-8770-592966D00E3D}
Expand Down
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"Version": 1,
"ProjectMap": {
"a2fe74e1-b743-11d0-ae1a-00a0c90fffc3": {
"ProjectGuid": "a2fe74e1-b743-11d0-ae1a-00a0c90fffc3",
"DisplayName": "Miscellaneous Files",
"ColorIndex": -1
}
},
"NextColorIndex": 0
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 3 additions & 0 deletions ext/OptimusEnabler/OptimusEnabler/.vs/ProjectSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"CurrentProjectSetting": "x64-Release"
}
7 changes: 7 additions & 0 deletions ext/OptimusEnabler/OptimusEnabler/.vs/VSWorkspaceState.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"ExpandedNodes": [
"",
"\\OptimusEnabler"
],
"PreviewInSolutionExplorer": false
}
Binary file added ext/OptimusEnabler/OptimusEnabler/.vs/cmake.db
Binary file not shown.
Binary file not shown.
5 changes: 5 additions & 0 deletions ext/OptimusEnabler/OptimusEnabler/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cmake_minimum_required (VERSION 3.8)

project ("OptimusEnabler")

add_subdirectory ("OptimusEnabler")
27 changes: 27 additions & 0 deletions ext/OptimusEnabler/OptimusEnabler/CMakeSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"configurations": [
{
"name": "x64-Debug",
"generator": "Ninja",
"configurationType": "Debug",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "",
"ctestCommandArgs": ""
},
{
"name": "x64-Release",
"generator": "Ninja",
"configurationType": "RelWithDebInfo",
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "",
"ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x64_x64" ],
"variables": []
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
cmake_minimum_required (VERSION 3.8)

add_library (OptimusEnabler SHARED "OptimusEnabler.cpp" "OptimusEnabler.h")

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#include "OptimusEnabler.h"

int GetNvidiaOptimus()
{
return NvOptimusEnablement;
}
int GetAmdOptimus()
{
return AmdPowerXpressRequestHighPerformance;
}
17 changes: 17 additions & 0 deletions ext/OptimusEnabler/OptimusEnabler/OptimusEnabler/OptimusEnabler.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#pragma once

#ifdef _WIN32

#include <Windows.h>
extern "C"
{
__declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
__declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;

__declspec(dllexport) int GetNvidiaOptimus();
__declspec(dllexport) int GetAmdOptimus();
}

#endif // _WIN32


Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2},{"kind":"toolchains","version":1}]}
Loading