Skip to content

Commit

Permalink
Auto merge of #1297 - kvark:bind, r=msiglreith
Browse files Browse the repository at this point in the history
[LL] Make DX12 ~~great~~ compile again!

This is a big WIP work, but I think we can merge this at any point in order to minimize friction with other changes.
  • Loading branch information
homu committed Jun 8, 2017
2 parents 190728a + 7d9f997 commit a0d9b7e
Show file tree
Hide file tree
Showing 9 changed files with 391 additions and 140 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ gfx_window_sdl = { path = "src/window/sdl", version = "0.7" }

[target.'cfg(windows)'.dependencies]
gfx_device_dx11 = { path = "src/backend/dx11", version = "0.6" }
# gfx_device_dx12ll = { path = "src/backend/dx12ll", version = "0.1" }
gfx_device_dx12ll = { path = "src/backend/dx12ll", version = "0.1" }
gfx_window_dxgi = { path = "src/window/dxgi", version = "0.8" }

[[example]]
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
environment:
matrix:
- TARGET: 1.16.0-x86_64-pc-windows
- TARGET: 1.18.0-x86_64-pc-windows
COMPILER: gnu
- TARGET: 1.16.0-x86_64-pc-windows
- TARGET: 1.18.0-x86_64-pc-windows
COMPILER: msvc
- TARGET: nightly-x86_64-pc-windows
COMPILER: msvc
Expand Down
8 changes: 4 additions & 4 deletions examples/trianglell/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ extern crate gfx_device_metalll as back;
extern crate winit;
extern crate image;

use gfx_corell::{buffer, command, format, pass, pso, shade, state, target,
use gfx_corell::{buffer, command, format, pass, pso, shade, state, target,
Device, CommandPool, GraphicsCommandPool, CommandQueue,
GraphicsCommandBuffer, ProcessingCommandBuffer, TransferCommandBuffer, PrimaryCommandBuffer,
Primitive, Instance, Adapter, Surface, SwapChain, QueueFamily, QueueSubmit, Factory, SubPass, FrameSync};
Expand Down Expand Up @@ -75,7 +75,7 @@ fn main() {
let surface = instance.create_surface(&window);

let queue_descs = physical_devices[0].get_queue_families().map(|family| { (family, family.num_queues()) });

for device in &physical_devices {
println!("{:?}", device.get_info());
}
Expand Down Expand Up @@ -376,7 +376,7 @@ fn main() {
None,
);
}

//
let mut running = true;
while running {
Expand Down Expand Up @@ -416,7 +416,7 @@ fn main() {
}

// TODO: should transition to (_, Present) -> Present (for d3d12)

cmd_buffer.finish()
};

Expand Down
Loading

0 comments on commit a0d9b7e

Please sign in to comment.