Skip to content
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.

Sign up for GitHub

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

Jump to bottom

D3D12: Support for SHADER_4_COMPONENT_MAPPING macros #2467

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

D3D12: Support for SHADER_4_COMPONENT_MAPPING macros #2467

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c5ebec2
Add dxgidebug.h implementation to dxgi package
Hyp-X Feb 6, 2023
f1da4bd
Merge branch 'odin-lang:master' into develop
Hyp-X Feb 15, 2023
d4a957f
Fixed d3d12 shader reflection vtables
Hyp-X Feb 15, 2023
d541336
Merge branch 'develop' of https://github.com/Hyp-X/Odin into develop
Hyp-X Feb 15, 2023
c98d408
Merge branch 'odin-lang:master' into develop
Hyp-X Feb 23, 2023
33eaa94
Fix d3d12 GetResourceAllocationInfo signature
Hyp-X Feb 23, 2023
4efe00f
Fix d3d12 HEAP_FLAG_ALLOW_ONLY_BUFFERS flags
Hyp-X Feb 23, 2023
1012692
Add d3d12shader missing types and UUID's
Hyp-X Feb 24, 2023
fe39cf8
Add vendor:directx/dxc package:
Hyp-X Feb 24, 2023
b14ca93
Merge branch 'odin-lang:master' into develop
Hyp-X Feb 24, 2023
b84dd27
Merge branch 'odin-lang:master' into develop
Hyp-X Feb 28, 2023
e7b8c81
d3d12: Translated SHADER_COMPONENT_MAPPING macros
Hyp-X Mar 2, 2023
acbbd34
Merge branch 'odin-lang:master' into develop
Hyp-X Mar 3, 2023
27972a6
Merge branch 'odin-lang:master' into develop
Hyp-X Apr 18, 2023
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
12 changes: 12 additions & 0 deletions vendor/directx/d3d12/d3d12_constants.odin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,18 @@ WHQL_DRAW_VERTEX_COUNT_2_TO_EXP :: 25

SHADER_COMPONENT_MAPPING_MASK :: 0x7
SHADER_COMPONENT_MAPPING_SHIFT :: 3
SHADER_COMPONENT_MAPPING_ALWAYS_SET_BIT_AVOIDING_ZEROMEM_MISTAKES :: 1<<(SHADER_COMPONENT_MAPPING_SHIFT*4)
ENCODE_SHADER_4_COMPONENT_MAPPING :: proc(Src0, Src1, Src2, Src3: SHADER_COMPONENT_MAPPING) -> u32 {
return (u32(Src0)&SHADER_COMPONENT_MAPPING_MASK)|
((u32(Src1)&SHADER_COMPONENT_MAPPING_MASK)<<SHADER_COMPONENT_MAPPING_SHIFT)|
((u32(Src2)&SHADER_COMPONENT_MAPPING_MASK)<<(SHADER_COMPONENT_MAPPING_SHIFT*2))|
((u32(Src3)&SHADER_COMPONENT_MAPPING_MASK)<<(SHADER_COMPONENT_MAPPING_SHIFT*3))|
SHADER_COMPONENT_MAPPING_ALWAYS_SET_BIT_AVOIDING_ZEROMEM_MISTAKES
}
DECODE_SHADER_4_COMPONENT_MAPPING :: proc(ComponentToExtract, Mapping: u32) -> SHADER_COMPONENT_MAPPING {
Comment on lines +502 to +509
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recommend making these proc "c" or something that is the default "odin" calling convention

return SHADER_COMPONENT_MAPPING(Mapping >> (SHADER_COMPONENT_MAPPING_SHIFT*ComponentToExtract) & SHADER_COMPONENT_MAPPING_MASK)
}
DEFAULT_SHADER_4_COMPONENT_MAPPING := ENCODE_SHADER_4_COMPONENT_MAPPING(.FROM_MEMORY_COMPONENT_0, .FROM_MEMORY_COMPONENT_1, .FROM_MEMORY_COMPONENT_2, .FROM_MEMORY_COMPONENT_3)

FILTER_REDUCTION_TYPE_MASK :: 0x3
FILTER_REDUCTION_TYPE_SHIFT :: 7
Expand Down