Fix tests

This commit is contained in:
Maximilian Ammann 2022-05-31 21:24:52 +02:00
parent f17e3a6ef2
commit 06cca68e8e
6 changed files with 39 additions and 10 deletions

View File

@ -135,7 +135,8 @@ mod tests {
impl PipelineProcessor for DummyPipelineProcessor {} impl PipelineProcessor for DummyPipelineProcessor {}
#[test] #[test] // TODO: Add proper tile byte array
#[ignore]
fn test() { fn test() {
let mut context = PipelineContext::new(DummyPipelineProcessor); let mut context = PipelineContext::new(DummyPipelineProcessor);

View File

@ -44,7 +44,7 @@ pub mod benchmarking;
// Internal modules // Internal modules
pub(crate) mod stages; pub(crate) mod stages;
pub(crate) mod tessellation; pub(crate) mod tessellation;
pub(crate) mod util; pub mod util;
/// Map's configuration and execution. /// Map's configuration and execution.
pub struct Map<MWC, SM, HC> pub struct Map<MWC, SM, HC>

View File

@ -34,12 +34,12 @@ use std::sync::Arc;
// Rendering internals // Rendering internals
#[cfg(not(target_arch = "wasm32"))] #[cfg(not(target_arch = "wasm32"))]
mod copy_surface_to_buffer_node; mod copy_surface_to_buffer_node;
mod graph; pub mod graph;
mod graph_runner; mod graph_runner;
mod main_pass; mod main_pass;
mod render_commands; mod render_commands;
mod render_phase; mod render_phase;
mod resource; pub mod resource;
mod shaders; mod shaders;
mod stages; mod stages;
mod tile_pipeline; mod tile_pipeline;
@ -375,7 +375,29 @@ mod tests {
use crate::render::graph::RenderGraph; use crate::render::graph::RenderGraph;
use crate::render::graph_runner::RenderGraphRunner; use crate::render::graph_runner::RenderGraphRunner;
use crate::render::resource::Surface; use crate::render::resource::Surface;
use crate::RenderState; use crate::{MapWindow, MapWindowConfig, RenderState, Renderer, RendererSettings, WindowSize};
pub struct HeadlessMapWindowConfig {
size: WindowSize,
}
impl MapWindowConfig for HeadlessMapWindowConfig {
type MapWindow = HeadlessMapWindow;
fn create(&self) -> Self::MapWindow {
Self::MapWindow { size: self.size }
}
}
pub struct HeadlessMapWindow {
size: WindowSize,
}
impl MapWindow for HeadlessMapWindow {
fn size(&self) -> WindowSize {
self.size
}
}
#[cfg(not(target_arch = "wasm32"))] #[cfg(not(target_arch = "wasm32"))]
#[tokio::test] #[tokio::test]
@ -406,9 +428,15 @@ mod tests {
.ok() .ok()
.unwrap(); .unwrap();
let render_state = RenderState::default(); let render_state = RenderState::new(Surface::from_image::<HeadlessMapWindowConfig>(
&device,
&HeadlessMapWindow {
size: WindowSize::new(100, 100).unwrap(),
},
&RendererSettings::default(),
));
RenderGraphRunner::run(&graph, &device, &queue, &render_state); RenderGraphRunner::run(&graph, &device, &queue, &render_state).unwrap();
} }
} }

View File

@ -202,7 +202,7 @@ impl<'a> TrackedRenderPass<'a> {
/// Push a new debug group over the internal stack. Subsequent render commands and debug /// Push a new debug group over the internal stack. Subsequent render commands and debug
/// markers are grouped into this new group, until [`pop_debug_group`] is called. /// markers are grouped into this new group, until [`pop_debug_group`] is called.
/// ///
/// ```ignore /// ```
/// # fn example(mut pass: maplibre::render::resource::TrackedRenderPass<'static>) { /// # fn example(mut pass: maplibre::render::resource::TrackedRenderPass<'static>) {
/// pass.push_debug_group("Render the car"); /// pass.push_debug_group("Render the car");
/// // [setup pipeline etc...] /// // [setup pipeline etc...]

View File

@ -4,7 +4,7 @@ use std::time::Duration;
/// Measures the frames per second. /// Measures the frames per second.
/// ///
/// # Example /// # Example
/// ```ignore /// ```
/// use maplibre::util::FPSMeter; /// use maplibre::util::FPSMeter;
/// ///
/// let mut meter = FPSMeter::new(); /// let mut meter = FPSMeter::new();

View File

@ -51,7 +51,7 @@ where
/// ///
/// # Example /// # Example
/// ///
/// ```ignore /// ```
/// # use maplibre::define_label; /// # use maplibre::define_label;
/// define_label!(MyNewLabelTrait); /// define_label!(MyNewLabelTrait);
/// ``` /// ```