Skip to content

Commit 37f2bfb

Browse files
[Editor] Fixes to backends;
[Rendering] Stop RenderWindow when initializing renderers;
1 parent b9cdd83 commit 37f2bfb

File tree

6 files changed

+5
-6
lines changed

6 files changed

+5
-6
lines changed

Engine/Staple.Core/Rendering/Windowing/RenderWindow.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,8 @@ internal void InitializeRenderer()
542542
Log.Info($"[RenderWindow] {renderer} OK!");
543543

544544
CurrentRenderer = renderer;
545+
546+
break;
545547
}
546548
}
547549
}

Staging/PlayerBackends/Android/PlayerBackend.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"publish": false,
99
"dataDirIsOutput": false,
1010
"renderers": [
11-
"OpenGLES",
1211
"Vulkan"
1312
]
1413
}

Staging/PlayerBackends/Linux/PlayerBackend.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"publish": true,
99
"dataDirIsOutput": true,
1010
"renderers": [
11-
"OpenGL",
1211
"Vulkan"
1312
]
1413
}

Staging/PlayerBackends/Windows/PlayerBackend.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
"dataDirIsOutput": true,
1010
"appIconExtension": "ico",
1111
"renderers": [
12-
"Direct3D11",
13-
"OpenGL",
12+
"Direct3D12",
1413
"Vulkan"
1514
]
1615
}

TestProject/Settings/AppSettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
],
1717
"renderers": {
1818
"Windows": [
19-
"Direct3D11",
19+
"Direct3D12",
2020
"Vulkan"
2121
],
2222
"Linux": [

Tools/Baker/Baker+Shaders.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ byte[] ProcessShader(string shaderFileName, List<string> extraDefines,
362362
{
363363
case Renderer.d3d12:
364364

365-
destinationFormat = "-d dxbc";
365+
destinationFormat = "-d dxil";
366366

367367
break;
368368

0 commit comments

Comments
 (0)