Skip to content

Commit e8da533

Browse files
committed
Merge branch 'master' into core_os2_revamp
2 parents b7750d8 + 2508b82 commit e8da533

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

misc/shell.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ rem call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
55
rem call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 1> NUL
66
rem call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 1> NUL
77
rem call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 1> NUL
8-
call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64 1> NUL
8+
call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 1> NUL
99
set _NO_DEBUG_HEAP=1
1010

1111
set ODIN_IGNORE_MSVC_CHECK=1

vendor/directx/d3d12/d3d12.odin

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ STREAM_OUTPUT_DESC :: struct {
719719
}
720720

721721
INPUT_LAYOUT_DESC :: struct {
722-
pInputElementDescs: [^]INPUT_ELEMENT_DESC,
722+
pInputElementDescs: [^]INPUT_ELEMENT_DESC `fmt:"v,NumElements"`,
723723
NumElements: u32,
724724
}
725725

@@ -1649,7 +1649,7 @@ VIEW_INSTANCING_FLAG :: enum u32 {
16491649

16501650
VIEW_INSTANCING_DESC :: struct {
16511651
ViewInstanceCount: u32,
1652-
pViewInstanceLocations: [^]VIEW_INSTANCE_LOCATION,
1652+
pViewInstanceLocations: [^]VIEW_INSTANCE_LOCATION `fmt:"v,ViewInstanceCount"`,
16531653
Flags: VIEW_INSTANCING_FLAGS,
16541654
}
16551655

@@ -3090,13 +3090,13 @@ EXISTING_COLLECTION_DESC :: struct {
30903090
SUBOBJECT_TO_EXPORTS_ASSOCIATION :: struct {
30913091
pSubobjectToAssociate: ^STATE_SUBOBJECT,
30923092
NumExports: u32,
3093-
pExports: [^]^i16,
3093+
pExports: [^]cstring16 `fmt:"v,NumExports"`,
30943094
}
30953095

30963096
DXIL_SUBOBJECT_TO_EXPORTS_ASSOCIATION :: struct {
3097-
SubobjectToAssociate: ^i16,
3097+
SubobjectToAssociate: cstring16,
30983098
NumExports: u32,
3099-
pExports: [^]^i16,
3099+
pExports: [^]cstring16 `fmt:"v,NumExports"`,
31003100
}
31013101

31023102
HIT_GROUP_TYPE :: enum i32 {
@@ -3105,11 +3105,11 @@ HIT_GROUP_TYPE :: enum i32 {
31053105
}
31063106

31073107
HIT_GROUP_DESC :: struct {
3108-
HitGroupExport: ^i16,
3108+
HitGroupExport: cstring16,
31093109
Type: HIT_GROUP_TYPE,
3110-
AnyHitShaderImport: ^i16,
3111-
ClosestHitShaderImport: ^i16,
3112-
IntersectionShaderImport: ^i16,
3110+
AnyHitShaderImport: cstring16,
3111+
ClosestHitShaderImport: cstring16,
3112+
IntersectionShaderImport: cstring16,
31133113
}
31143114

31153115
RAYTRACING_SHADER_CONFIG :: struct {
@@ -3506,14 +3506,14 @@ DRED_ALLOCATION_TYPE :: enum i32 {
35063506

35073507
DRED_ALLOCATION_NODE :: struct {
35083508
ObjectNameA: cstring,
3509-
ObjectNameW: ^i16,
3509+
ObjectNameW: cstring16,
35103510
AllocationType: DRED_ALLOCATION_TYPE,
35113511
pNext: ^DRED_ALLOCATION_NODE,
35123512
}
35133513

35143514
DRED_ALLOCATION_NODE1 :: struct {
35153515
ObjectNameA: cstring,
3516-
ObjectNameW: ^i16,
3516+
ObjectNameW: cstring16,
35173517
AllocationType: DRED_ALLOCATION_TYPE,
35183518
pNext: ^DRED_ALLOCATION_NODE1,
35193519
pObject: ^IUnknown,
@@ -3539,7 +3539,7 @@ DRED_PAGE_FAULT_OUTPUT1 :: struct {
35393539
pHeadRecentFreedAllocationNode: ^DRED_ALLOCATION_NODE1,
35403540
}
35413541

3542-
DRED_PAGE_FAULT_FLAGS :: bit_set[DRED_PAGE_FAULT_FLAG;u32]
3542+
DRED_PAGE_FAULT_FLAGS :: distinct bit_set[DRED_PAGE_FAULT_FLAG; u32]
35433543
DRED_PAGE_FAULT_FLAG :: enum u32 {
35443544
}
35453545

@@ -3819,7 +3819,7 @@ RENDER_PASS_ENDING_ACCESS_RESOLVE_PARAMETERS :: struct {
38193819
pSrcResource: ^IResource,
38203820
pDstResource: ^IResource,
38213821
SubresourceCount: u32,
3822-
pSubresourceParameters: [^]RENDER_PASS_ENDING_ACCESS_RESOLVE_SUBRESOURCE_PARAMETERS,
3822+
pSubresourceParameters: [^]RENDER_PASS_ENDING_ACCESS_RESOLVE_SUBRESOURCE_PARAMETERS `fmt:"v,SubresourceCount"`,
38233823
Format: dxgi.FORMAT,
38243824
ResolveMode: RESOLVE_MODE,
38253825
PreserveResolveSource: BOOL,
@@ -3901,7 +3901,7 @@ SHADER_CACHE_MODE :: enum i32 {
39013901
DISK = 1,
39023902
}
39033903

3904-
SHADER_CACHE_FLAGS :: bit_set[SHADER_CACHE_FLAG;u32]
3904+
SHADER_CACHE_FLAGS :: distinct bit_set[SHADER_CACHE_FLAG; u32]
39053905
SHADER_CACHE_FLAG :: enum u32 {
39063906
DRIVER_VERSIONED = 0,
39073907
USE_WORKING_DIR = 1,
@@ -3932,15 +3932,15 @@ IShaderCacheSession_VTable :: struct {
39323932
}
39333933

39343934

3935-
SHADER_CACHE_KIND_FLAGS :: bit_set[SHADER_CACHE_KIND_FLAG;u32]
3935+
SHADER_CACHE_KIND_FLAGS :: distinct bit_set[SHADER_CACHE_KIND_FLAG; u32]
39363936
SHADER_CACHE_KIND_FLAG :: enum u32 {
39373937
IMPLICIT_D3D_CACHE_FOR_DRIVER = 0,
39383938
IMPLICIT_D3D_CONVERSIONS = 1,
39393939
IMPLICIT_DRIVER_MANAGED = 2,
39403940
APPLICATION_MANAGED = 3,
39413941
}
39423942

3943-
SHADER_CACHE_CONTROL_FLAGS :: bit_set[SHADER_CACHE_CONTROL_FLAG;u32]
3943+
SHADER_CACHE_CONTROL_FLAGS :: distinct bit_set[SHADER_CACHE_CONTROL_FLAG; u32]
39443944
SHADER_CACHE_CONTROL_FLAG :: enum u32 {
39453945
DISABLE = 0,
39463946
ENABLE = 1,

0 commit comments

Comments
 (0)