Merge branch 'master' of https://github.com/elbadcode/3Dmigoto

.github/workflows/zip_release.yml

@@ -0,0 +1,79 @@
+# This workflow will build geo-11 for Release use, but is specifically set
+# up to build the HelixMod version.
+# This is a basic workflow that will only be manually triggered, but will
+# call through to the main Release workflow.
+
+name: HelixMod Manual Build
+
+# Controls when the action will run. Workflow runs when manually triggered using the UI.
+on:
+  workflow_dispatch:
+    # Inputs the workflow accepts.
+    inputs:
+      name:
+        # Friendly description to be shown in the UI instead of 'name'
+        description: 'Create a Release build for HelixMod use'
+        # Default value if no value is explicitly provided
+        default: 'World'
+        # Input has to be provided for the workflow to run
+        required: true
+
+# This is a copy of the msbuild.yml action script. The setup to
+# call out to another job is too restrictive, so let's just duplicate
+# the sequence, but upload different artifact here.
+
+jobs:
+  zip_release_workflow:
+
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout vs2022
+      uses: actions/checkout@v2
+
+    - name: Add MSBuild for vs2022 to PATH
+      uses: microsoft/setup-msbuild@v2
+      with:
+        vs-version: '[17)'
+
+
+#    - name: Setup NuGet.exe for use with actions
+#      uses: NuGet/[email protected]
+#    - name: Restore nuget packages
+#      run: nuget restore StereovisionHacks.sln
+
+    - name: Build via Publish.bat
+      shell: cmd
+      run: call .\Publish.bat 
+
+# In order to pass the version number from the Publish.bat script back here to Actions,
+# we need to fetch it using powershell commands. Normal echo and cat don't work here.
+# Fetches the version from the embedded version file name.
+# It's also worth noting that the env.GITHUB_ENV is only read at the start of a Step,
+# so the variable will be wrong until the next step.
+
+    - name: Versioning
+      shell: pwsh
+      run: |
+        cat ".\Zip Release\Version-*" | Set-Variable -Name "BUILD_VERSION"
+        echo "Set BUILD_VERSION=" ${BUILD_VERSION}
+        echo "BUILD_VERSION=${BUILD_VERSION}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+        
+# Add a new commit for the bump in version number.        
+# We add the git pull --ff 
+
+    - name: Commit version change
+      run: |
+        git config --global user.name 'CI Build'
+        git config --global user.email '[email protected]'
+        git pull --ff-only
+        git commit -am "CI Build - ${{env.BUILD_VERSION}}"
+        git push
+        
+# Now we can upload the remaining artifacts as the HelixMod version.
+
+    - name: Upload HelixMod build
+      uses: actions/upload-artifact@v4
+      with:
+        name: 3Dmigoto v${{env.BUILD_VERSION}}
+        path: Zip Release\

DirectX11/D3D11Wrapper.cpp

@@ -539,6 +539,24 @@ void InitD311()
 #endif
 }
 
+HRESULT WINAPI D3D11On12CreateDevice(
+	_In_ IUnknown* pDevice,
+	UINT Flags,
+	_In_reads_opt_(FeatureLevels) CONST D3D_FEATURE_LEVEL* pFeatureLevels,
+	UINT FeatureLevels,
+	_In_reads_opt_(NumQueues) IUnknown* CONST* ppCommandQueues,
+	UINT NumQueues,
+	UINT NodeMask,
+	_COM_Outptr_opt_ ID3D11Device** ppDevice,
+	_COM_Outptr_opt_ ID3D11DeviceContext** ppImmediateContext,
+	_Out_opt_ D3D_FEATURE_LEVEL* pChosenFeatureLevel)
+{
+	InitD311();
+	LogInfo("D3D11On12CreateDevice called.\n");
+
+	return (*_D3D11On12CreateDevice)(pDevice, Flags, pFeatureLevels, FeatureLevels, ppCommandQueues, NumQueues, NodeMask, ppDevice, ppImmediateContext, pChosenFeatureLevel);
+}
+
 int WINAPI D3DKMTQueryAdapterInfo(_D3DKMT_QUERYADAPTERINFO *info)
 {
 	InitD311();

DirectX11/d3d11Wrapper.def

@@ -55,7 +55,7 @@ EXPORTS
 ; D3DPerformance_EndEvent
 ; D3DPerformance_GetStatus
 ; D3DPerformance_SetMarker
-
+	D3D11On12CreateDevice				@43
 
 ; Full list from d3d11.dll, sorted by Hint:
 ; D3D11CoreCreateDevice

iid.cpp

@@ -48,7 +48,9 @@ struct IID_name {
 // DirectX (for informational / debugging purposes only):
 DEFINE_GUID(IID_ReShadeD3D10Device,         0x88399375, 0x734F, 0x4892, 0xA9, 0x5F, 0x70, 0xDD, 0x42, 0xCE, 0x7C, 0xDD);
 DEFINE_GUID(IID_ReShadeD3D11Device,         0x72299288, 0x2C68, 0x4AD8, 0x94, 0x5D, 0x2B, 0xFB, 0x5A, 0xA9, 0xC6, 0x09);
+DEFINE_GUID(IID_ReShadeD3D11on12Device,	    0x6BE8CF18, 0x2108, 0x4506, 0xAA, 0xA0, 0xAD, 0x5A, 0x29, 0x81, 0x2A, 0x31);
 DEFINE_GUID(IID_ReShadeD3D11DeviceContext,  0x27B0246B, 0x2152, 0x4D42, 0xAD, 0x11, 0x32, 0x48, 0x94, 0x72, 0x23, 0x8F);
+DEFINE_GUID(IID_ReShadeD3D11CommandList,	0x592F5E83, 0xA17B, 0x4EEB, 0xA2, 0xBF, 0x75, 0x68, 0xDA, 0x2A, 0x37, 0x28);
 DEFINE_GUID(IID_ReShadeDXGIDevice,          0xCB285C3B, 0x3677, 0x4332, 0x98, 0xC7, 0xD6, 0x33, 0x9B, 0x97, 0x82, 0xB1);
 DEFINE_GUID(IID_ReShadeDXGISwapChain,       0x1F445F9F, 0x9887, 0x4C4C, 0x90, 0x55, 0x4E, 0x3B, 0xAD, 0xAF, 0xCC, 0xA8);
 DEFINE_GUID(IID_SpecialKD3D11DeviceContext, 0xe8a22a3f, 0x1405, 0x424c, 0xae, 0x99, 0x0d, 0x3e, 0x9d, 0x54, 0x7c, 0x32); // Returns the unwrapped device
@@ -64,7 +66,9 @@ static const struct IID_name known_interfaces[] = {
 	// Third party tools:
 	IID(ReShadeD3D10Device),
 	IID(ReShadeD3D11Device),
+	IID(ReShadeD3D11on12Device),
 	IID(ReShadeD3D11DeviceContext),
+	IID(ReShadeD3D11CommandList),
 	IID(ReShadeDXGIDevice),
 	IID(ReShadeDXGISwapChain),
 	IID(SpecialKD3D11DeviceContext),