Merge #93

93: Cleaner destruction of events and query pools r=msiglreith a=kvark



Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>

Cargo.lock

@@ -252,7 +252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "gfx-backend-dx12"
 version = "0.1.0"
-source = "git+https://github.com/gfx-rs/gfx#91ec6303fded63498b01e4a55e8ebe6768d3c2cc"
+source = "git+https://github.com/gfx-rs/gfx#505e8057803d8cc0302b5fdcfe7ae807b8f3b8cf"
 dependencies = [
  "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "derivative 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -268,7 +268,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-metal"
 version = "0.1.0"
-source = "git+https://github.com/gfx-rs/gfx#91ec6303fded63498b01e4a55e8ebe6768d3c2cc"
+source = "git+https://github.com/gfx-rs/gfx#505e8057803d8cc0302b5fdcfe7ae807b8f3b8cf"
 dependencies = [
  "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -290,7 +290,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-vulkan"
 version = "0.1.0"
-source = "git+https://github.com/gfx-rs/gfx#91ec6303fded63498b01e4a55e8ebe6768d3c2cc"
+source = "git+https://github.com/gfx-rs/gfx#505e8057803d8cc0302b5fdcfe7ae807b8f3b8cf"
 dependencies = [
  "ash 0.24.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -308,7 +308,7 @@ dependencies = [
 [[package]]
 name = "gfx-hal"
 version = "0.1.0"
-source = "git+https://github.com/gfx-rs/gfx#91ec6303fded63498b01e4a55e8ebe6768d3c2cc"
+source = "git+https://github.com/gfx-rs/gfx#505e8057803d8cc0302b5fdcfe7ae807b8f3b8cf"
 dependencies = [
  "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",

Makefile

@@ -104,4 +104,4 @@ clean:
 	cargo clean
 
 cherry: $(TARGET)
-	cd $(CHERRY_DIR) && RUST_LOG=warn LD_LIBRARY_PATH=$(FULL_LIBRARY_PATH) go run server.go
+	cd $(CHERRY_DIR) && rm -f Cherry.db && RUST_LOG=warn LD_LIBRARY_PATH=$(FULL_LIBRARY_PATH) go run server.go

libportability-gfx/src/conv.rs

@@ -12,6 +12,8 @@ pub fn limits_from_hal(limits: Limits) -> VkPhysicalDeviceLimits {
         maxImageDimension2D: limits.max_texture_size as _,
         maxImageDimension3D: limits.max_texture_size as _,
         maxImageDimensionCube: limits.max_texture_size as _,
+        maxFramebufferWidth: limits.max_texture_size as _, //TODO
+        maxFramebufferHeight: limits.max_texture_size as _, //TODO
         maxTexelBufferElements: limits.max_texture_size as _, //TODO
         maxTessellationPatchSize: limits.max_patch_size as _,
         maxViewports: limits.max_viewports as _,

libportability-gfx/src/impls.rs

@@ -10,9 +10,7 @@ use hal::command::RawCommandBuffer;
 use hal::queue::RawCommandQueue;
 
 use std::ffi::{CStr, CString};
-use std::mem;
+use std::{mem, ptr};
-#[cfg(feature = "renderdoc")]
-use std::ptr;
 #[cfg(feature = "renderdoc")]
 use std::os::raw::c_void;
 
@@ -604,7 +602,7 @@ pub extern "C" fn gfxDestroyDevice(gpu: VkDevice, _pAllocator: *const VkAllocati
             d.renderdoc.end_frame_capture(device as *mut _, ptr::null());
         }
 
-        for (_, family) in d.queues {
+        for (_, family) in d.queues.drain() {
             for queue in family {
                 let _ = queue.unbox();
             }
@@ -1142,10 +1140,12 @@ pub extern "C" fn gfxCreateEvent(
 #[inline]
 pub extern "C" fn gfxDestroyEvent(
     _gpu: VkDevice,
-    _event: VkEvent,
+    event: VkEvent,
     _pAllocator: *const VkAllocationCallbacks,
 ) {
-    unimplemented!()
+    if event != ptr::null_mut() {
+        unimplemented!()
+    }
 }
 #[inline]
 pub extern "C" fn gfxGetEventStatus(_gpu: VkDevice, _event: VkEvent) -> VkResult {
@@ -1172,10 +1172,12 @@ pub extern "C" fn gfxCreateQueryPool(
 #[inline]
 pub extern "C" fn gfxDestroyQueryPool(
     _gpu: VkDevice,
-    _queryPool: VkQueryPool,
+    queryPool: VkQueryPool,
     _pAllocator: *const VkAllocationCallbacks,
 ) {
-    unimplemented!()
+    if queryPool != ptr::null_mut() {
+        unimplemented!()
+    }
 }
 #[inline]
 pub extern "C" fn gfxGetQueryPoolResults(
@@ -1484,7 +1486,7 @@ pub extern "C" fn gfxCreateGraphicsPipelines(
                 .pSpecializationInfo
                 .as_ref()
                 .map(conv::map_specialization_info)
-                .unwrap_or(vec![])
+                .unwrap_or_default()
             };
 
             shader_stages.push((
@@ -1863,69 +1865,74 @@ pub extern "C" fn gfxCreateComputePipelines(
         slice::from_raw_parts(pCreateInfos, createInfoCount as _)
     };
 
-    let mut shader_stages = Vec::with_capacity(infos.len());
-
     // Collect all information which we will borrow later. Need to work around
     // the borrow checker here.
     // TODO: try to refactor it once we have a more generic API
-    for info in infos {
+    let shader_stages = infos
-        let name = unsafe { CStr::from_ptr(info.stage.pName).to_owned() };
+        .iter()
-        let specialization = unsafe { info.stage
+        .map(|info| {
-            .pSpecializationInfo
+            let name = unsafe { CStr::from_ptr(info.stage.pName).to_owned() };
-            .as_ref()
+            let specialization = unsafe { info.stage
-            .map(conv::map_specialization_info)
+                .pSpecializationInfo
-            .unwrap_or(vec![])
+                .as_ref()
-        };
+                .map(conv::map_specialization_info)
+                .unwrap_or_default()
+            };
 
-        shader_stages.push((
+            (
-            name.into_string().unwrap(),
+                name.into_string().unwrap(),
-            specialization,
+                specialization,
-        ));
+            )
-    }
+        })
+        .collect::<Vec<_>>();
 
-    let descs = infos.into_iter().zip(&shader_stages).map(|(info, &(ref entry, ref specialization))| {
+    let descs = infos
-        let shader = pso::EntryPoint {
+        .into_iter()
-            entry,
+        .zip(&shader_stages)
-            module: &*info.stage.module,
+        .map(|(info, &(ref entry, ref specialization))| {
-            specialization,
+            let shader = pso::EntryPoint {
-        };
+                entry,
-        let layout = &*info.layout;
+                module: &*info.stage.module,
+                specialization,
+            };
+            let layout = &*info.layout;
 
-        let flags = {
+            let flags = {
-            let mut flags = pso::PipelineCreationFlags::empty();
+                let mut flags = pso::PipelineCreationFlags::empty();
 
-            if info.flags & VkPipelineCreateFlagBits::VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT as u32 != 0 {
+                if info.flags & VkPipelineCreateFlagBits::VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT as u32 != 0 {
-                flags |= pso::PipelineCreationFlags::DISABLE_OPTIMIZATION;
+                    flags |= pso::PipelineCreationFlags::DISABLE_OPTIMIZATION;
-            }
+                }
-            if info.flags & VkPipelineCreateFlagBits::VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT as u32 != 0 {
+                if info.flags & VkPipelineCreateFlagBits::VK_PIPELINE_CREATE_ALLOW_DERIVATIVES_BIT as u32 != 0 {
-                flags |= pso::PipelineCreationFlags::ALLOW_DERIVATIVES;
+                    flags |= pso::PipelineCreationFlags::ALLOW_DERIVATIVES;
-            }
-
-            flags
-        };
-
-        let parent = {
-            let is_derivative = info.flags & VkPipelineCreateFlagBits::VK_PIPELINE_CREATE_DERIVATIVE_BIT as u32 != 0;
-
-            if let Some(base_pso) = info.basePipelineHandle.as_ref() {
-                match *base_pso {
-                    Pipeline::Graphics(_) => panic!("Base pipeline handle must be a compute pipeline"),
-                    Pipeline::Compute(ref pso) => pso::BasePipeline::Pipeline(pso),
                 }
-            } else if is_derivative && info.basePipelineIndex > 0 {
-                pso::BasePipeline::Index(info.basePipelineIndex as _)
-            } else {
-                pso::BasePipeline::None // TODO
-            }
-        };
 
-        pso::ComputePipelineDesc {
+                flags
-            shader,
+            };
-            layout,
+
-            flags,
+            let parent = {
-            parent,
+                let is_derivative = info.flags & VkPipelineCreateFlagBits::VK_PIPELINE_CREATE_DERIVATIVE_BIT as u32 != 0;
-        }
+
-    }).collect::<Vec<_>>();
+                if let Some(base_pso) = info.basePipelineHandle.as_ref() {
+                    match *base_pso {
+                        Pipeline::Graphics(_) => panic!("Base pipeline handle must be a compute pipeline"),
+                        Pipeline::Compute(ref pso) => pso::BasePipeline::Pipeline(pso),
+                    }
+                } else if is_derivative && info.basePipelineIndex > 0 {
+                    pso::BasePipeline::Index(info.basePipelineIndex as _)
+                } else {
+                    pso::BasePipeline::None // TODO
+                }
+            };
+
+            pso::ComputePipelineDesc {
+                shader,
+                layout,
+                flags,
+                parent,
+            }
+        })
+        .collect::<Vec<_>>();
 
     let pipelines = gpu.device.create_compute_pipelines(&descs);
 
@@ -2540,9 +2547,10 @@ pub extern "C" fn gfxDestroyRenderPass(
 pub extern "C" fn gfxGetRenderAreaGranularity(
     _gpu: VkDevice,
     _renderPass: VkRenderPass,
-    _pGranularity: *mut VkExtent2D,
+    pGranularity: *mut VkExtent2D,
 ) {
-    unimplemented!()
+    let granularity = VkExtent2D { width: 1, height: 1 }; //TODO?
+    unsafe { *pGranularity = granularity };
 }
 
 #[inline]