-
Notifications
You must be signed in to change notification settings - Fork 172
Add DirectSR (D3D12) super resolution implementation #780
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
MikhailGorobets
wants to merge
3
commits into
DiligentGraphics:super_resolution2
Choose a base branch
from
MikhailGorobets:super_resolution2
base: super_resolution2
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,421
−117
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * Copyright 2026 Diligent Graphics LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * In no event and under no legal theory, whether in tort (including negligence), | ||
| * contract, or otherwise, unless required by applicable law (such as deliberate | ||
| * and grossly negligent acts) or agreed to in writing, shall any Contributor be | ||
| * liable for any damages, including any direct, indirect, special, incidental, | ||
| * or consequential damages of any character arising as a result of this License or | ||
| * out of the use or inability to use the software (including but not limited to damages | ||
| * for loss of goodwill, work stoppage, computer failure or malfunction, or any and | ||
| * all other commercial damages or losses), even if such Contributor has been advised | ||
| * of the possibility of such damages. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "ObjectBase.hpp" | ||
| #include "SuperResolution.h" | ||
|
|
||
| #include <vector> | ||
| #include <string> | ||
|
|
||
| namespace Diligent | ||
| { | ||
|
|
||
| class SuperResolutionBase : public ObjectBase<ISuperResolution> | ||
| { | ||
| public: | ||
| using TBase = ObjectBase<ISuperResolution>; | ||
|
|
||
| SuperResolutionBase(IReferenceCounters* pRefCounters, | ||
| const SuperResolutionDesc& Desc) : | ||
| TBase{pRefCounters}, | ||
| m_Desc{Desc} | ||
| { | ||
| if (Desc.Name != nullptr) | ||
| { | ||
| m_Name = Desc.Name; | ||
| m_Desc.Name = m_Name.c_str(); | ||
| } | ||
| } | ||
|
|
||
| IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_SuperResolution, TBase) | ||
|
|
||
| virtual const SuperResolutionDesc& DILIGENT_CALL_TYPE GetDesc() const override final | ||
| { | ||
| return m_Desc; | ||
| } | ||
|
|
||
| virtual void DILIGENT_CALL_TYPE GetJitterOffset(Uint32 Index, float* pJitterX, float* pJitterY) const override final | ||
| { | ||
| DEV_CHECK_ERR(pJitterX != nullptr && pJitterY != nullptr, "pJitterX and pJitterY must not be null"); | ||
|
|
||
| if (!m_JitterPattern.empty()) | ||
| { | ||
| const Uint32 WrappedIndex = Index % static_cast<Uint32>(m_JitterPattern.size()); | ||
| *pJitterX = m_JitterPattern[WrappedIndex].X; | ||
| *pJitterY = m_JitterPattern[WrappedIndex].Y; | ||
| } | ||
| else | ||
| { | ||
| *pJitterX = 0.0f; | ||
| *pJitterY = 0.0f; | ||
| } | ||
| } | ||
|
|
||
| protected: | ||
| struct JitterOffset | ||
| { | ||
| float X = 0.0f; | ||
| float Y = 0.0f; | ||
| }; | ||
|
|
||
| SuperResolutionDesc m_Desc; | ||
| std::string m_Name; | ||
| std::vector<JitterOffset> m_JitterPattern; | ||
| }; | ||
|
|
||
| } // namespace Diligent | ||
47 changes: 47 additions & 0 deletions
47
Graphics/SuperResolution/include/SuperResolutionInternal.hpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Copyright 2026 Diligent Graphics LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * In no event and under no legal theory, whether in tort (including negligence), | ||
| * contract, or otherwise, unless required by applicable law (such as deliberate | ||
| * and grossly negligent acts) or agreed to in writing, shall any Contributor be | ||
| * liable for any damages, including any direct, indirect, special, incidental, | ||
| * or consequential damages of any character arising as a result of this License or | ||
| * out of the use or inability to use the software (including but not limited to damages | ||
| * for loss of goodwill, work stoppage, computer failure or malfunction, or any and | ||
| * all other commercial damages or losses), even if such Contributor has been advised | ||
| * of the possibility of such damages. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "SuperResolutionFactory.h" | ||
|
|
||
| #include <array> | ||
| #include <vector> | ||
|
|
||
| namespace Diligent | ||
| { | ||
|
|
||
| enum SUPER_RESOLUTION_BACKEND : Uint8 | ||
| { | ||
| SUPER_RESOLUTION_BACKEND_D3D12_DSR, | ||
| SUPER_RESOLUTION_BACKEND_METAL_FX, | ||
| SUPER_RESOLUTION_BACKEND_SOFTWARE, | ||
| SUPER_RESOLUTION_BACKEND_COUNT | ||
| }; | ||
|
|
||
| using SuperResolutionVariants = std::array<std::vector<SuperResolutionInfo>, SUPER_RESOLUTION_BACKEND_COUNT>; | ||
|
|
||
| } // namespace Diligent |
51 changes: 51 additions & 0 deletions
51
Graphics/SuperResolution/include/SuperResolution_D3D12.hpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * Copyright 2026 Diligent Graphics LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * In no event and under no legal theory, whether in tort (including negligence), | ||
| * contract, or otherwise, unless required by applicable law (such as deliberate | ||
| * and grossly negligent acts) or agreed to in writing, shall any Contributor be | ||
| * liable for any damages, including any direct, indirect, special, incidental, | ||
| * or consequential damages of any character arising as a result of this License or | ||
| * out of the use or inability to use the software (including but not limited to damages | ||
| * for loss of goodwill, work stoppage, computer failure or malfunction, or any and | ||
| * all other commercial damages or losses), even if such Contributor has been advised | ||
| * of the possibility of such damages. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "SuperResolutionInternal.hpp" | ||
|
|
||
| #include "../../GraphicsEngineD3D12/include/pch.h" | ||
| #include <directsr.h> | ||
|
|
||
| namespace Diligent | ||
| { | ||
|
|
||
| CComPtr<IDSRDevice> CreateDSRDeviceD3D12(IRenderDevice* pDevice); | ||
|
|
||
| void EnumerateVariantsD3D12(IDSRDevice* pDSRDevice, | ||
| std::vector<SuperResolutionInfo>& Variants); | ||
|
|
||
| void GetSourceSettingsD3D12(IDSRDevice* pDSRDevice, | ||
| const SuperResolutionSourceSettingsAttribs& Attribs, | ||
| SuperResolutionSourceSettings& Settings); | ||
|
|
||
| void CreateSuperResolutionD3D12(IRenderDevice* pDevice, | ||
| IDSRDevice* pDSRDevice, | ||
| const SuperResolutionDesc& Desc, | ||
| ISuperResolution** ppUpscaler); | ||
|
|
||
| } // namespace Diligent |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check warning
Code scanning / CodeQL
Local variable address stored in non-local memory Warning