Skip to content

Commit 6c2200e

Browse files
committed
Revert "Fixes a number of .Type -> .type (#1)"
This reverts commit 3bafa10.
1 parent a6330ff commit 6c2200e

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

src/bindings/d3d12.zig

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ pub const HEAP_PROPERTIES = extern struct {
111111
pub fn initType(heap_type: HEAP_TYPE) HEAP_PROPERTIES {
112112
var v = std.mem.zeroes(@This());
113113
v = HEAP_PROPERTIES{
114-
.type = heap_type,
114+
.Type = heap_type,
115115
.CPUPageProperty = .UNKNOWN,
116116
.MemoryPoolPreference = .UNKNOWN,
117117
.CreationNodeMask = 0,
@@ -583,7 +583,7 @@ pub const RESOURCE_BARRIER = extern struct {
583583

584584
pub fn initUav(resource: *IResource) RESOURCE_BARRIER {
585585
var v = std.mem.zeroes(@This());
586-
v = .{ .type = .UAV, .Flags = .{}, .u = .{ .UAV = .{ .pResource = resource } } };
586+
v = .{ .Type = .UAV, .Flags = .{}, .u = .{ .UAV = .{ .pResource = resource } } };
587587
return v;
588588
}
589589
};

src/zd3d12.zig

+13-13
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ pub const GraphicsContext = struct {
297297
const cmdqueue = blk: {
298298
var cmdqueue: *d3d12.ICommandQueue = undefined;
299299
hrPanicOnFail(device.CreateCommandQueue(&.{
300-
.type = .DIRECT,
300+
.Type = .DIRECT,
301301
.Priority = @intFromEnum(d3d12.COMMAND_QUEUE_PRIORITY.NORMAL),
302302
.Flags = .{},
303303
.NodeMask = 0,
@@ -1175,7 +1175,7 @@ pub const GraphicsContext = struct {
11751175
for (gctx.transition_resource_barriers.items) |barrier| {
11761176
if (gctx.resource_pool.isResourceValid(barrier.resource)) {
11771177
d3d12_barriers[num_valid_barriers] = .{
1178-
.type = .TRANSITION,
1178+
.Type = .TRANSITION,
11791179
.Flags = .{},
11801180
.u = .{
11811181
.Transition = .{
@@ -1604,11 +1604,11 @@ pub const GraphicsContext = struct {
16041604

16051605
gctx.cmdlist.CopyTextureRegion(&.{
16061606
.pResource = gctx.lookupResource(texture).?,
1607-
.type = .SUBRESOURCE_INDEX,
1607+
.Type = .SUBRESOURCE_INDEX,
16081608
.u = .{ .SubresourceIndex = subresource },
16091609
}, 0, 0, 0, &.{
16101610
.pResource = upload.buffer,
1611-
.type = .PLACED_FOOTPRINT,
1611+
.Type = .PLACED_FOOTPRINT,
16121612
.u = .{ .PlacedFootprint = layout[0] },
16131613
}, null);
16141614
}
@@ -1642,11 +1642,11 @@ pub const GraphicsContext = struct {
16421642

16431643
gctx.cmdlist.CopyTextureRegion(&d3d12.TEXTURE_COPY_LOCATION{
16441644
.pResource = gctx.lookupResource(texture).?,
1645-
.type = .SUBRESOURCE_INDEX,
1645+
.Type = .SUBRESOURCE_INDEX,
16461646
.u = .{ .SubresourceIndex = 0 },
16471647
}, 0, 0, 0, &d3d12.TEXTURE_COPY_LOCATION{
16481648
.pResource = upload.buffer,
1649-
.type = .PLACED_FOOTPRINT,
1649+
.Type = .PLACED_FOOTPRINT,
16501650
.u = .{ .PlacedFootprint = layout[0] },
16511651
}, null);
16521652

@@ -1781,11 +1781,11 @@ pub const GraphicsContext = struct {
17811781

17821782
gctx.cmdlist.CopyTextureRegion(&d3d12.TEXTURE_COPY_LOCATION{
17831783
.pResource = gctx.lookupResource(texture).?,
1784-
.type = .SUBRESOURCE_INDEX,
1784+
.Type = .SUBRESOURCE_INDEX,
17851785
.u = .{ .SubresourceIndex = 0 },
17861786
}, 0, 0, 0, &d3d12.TEXTURE_COPY_LOCATION{
17871787
.pResource = upload.buffer,
1788-
.type = .PLACED_FOOTPRINT,
1788+
.Type = .PLACED_FOOTPRINT,
17891789
.u = .{ .PlacedFootprint = layout[0] },
17901790
}, null);
17911791

@@ -1886,11 +1886,11 @@ pub const GraphicsContext = struct {
18861886

18871887
gctx.cmdlist.CopyTextureRegion(&.{
18881888
.pResource = gctx.lookupResource(texture).?,
1889-
.type = .SUBRESOURCE_INDEX,
1889+
.Type = .SUBRESOURCE_INDEX,
18901890
.u = .{ .SubresourceIndex = subresource_index },
18911891
}, 0, 0, 0, &.{
18921892
.pResource = upload.buffer,
1893-
.type = .PLACED_FOOTPRINT,
1893+
.Type = .PLACED_FOOTPRINT,
18941894
.u = .{ .PlacedFootprint = layout[0] },
18951895
}, null);
18961896
}
@@ -2182,13 +2182,13 @@ pub const MipmapGenerator = struct {
21822182
while (mip_index < dispatch_num_mips) : (mip_index += 1) {
21832183
const dst = d3d12.TEXTURE_COPY_LOCATION{
21842184
.pResource = gctx.lookupResource(texture_handle).?,
2185-
.type = .SUBRESOURCE_INDEX,
2185+
.Type = .SUBRESOURCE_INDEX,
21862186
.u = .{ .SubresourceIndex = mip_index + 1 + current_src_mip_level +
21872187
array_slice * texture_desc.MipLevels },
21882188
};
21892189
const src = d3d12.TEXTURE_COPY_LOCATION{
21902190
.pResource = gctx.lookupResource(mipgen.scratch_textures[mip_index]).?,
2191-
.type = .SUBRESOURCE_INDEX,
2191+
.Type = .SUBRESOURCE_INDEX,
21922192
.u = .{ .SubresourceIndex = 0 },
21932193
};
21942194
const box = d3d12.BOX{
@@ -2489,7 +2489,7 @@ const DescriptorHeap = struct {
24892489
const heap = blk: {
24902490
var heap: ?*d3d12.IDescriptorHeap = null;
24912491
hrPanicOnFail(device.CreateDescriptorHeap(&.{
2492-
.type = heap_type,
2492+
.Type = heap_type,
24932493
.NumDescriptors = capacity,
24942494
.Flags = flags,
24952495
.NodeMask = 0,

0 commit comments

Comments
 (0)