move setup into strafesnet_graphics

Cargo.lock

@@ -1647,9 +1647,9 @@ dependencies = [
 
 [[package]]
 name = "strafesnet_graphics"
-version = "0.0.1"
+version = "0.0.2"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "2514be1d07402210ba2f5f75f008f6daaed134cc7ea6340dabf96418d5e23ba0"
+checksum = "a0f063bd3579397908d411cef8ee3a755760f567ff354247c21d503c2a406669"
 dependencies = [
  "bytemuck",
  "ddsfile",

Cargo.toml

@@ -13,6 +13,6 @@ codegen-units = 1
 
 [workspace.dependencies]
 strafesnet_common = { version = "0.8.0", registry = "strafesnet" }
-strafesnet_graphics = { version = "0.0.1", registry = "strafesnet" }
+strafesnet_graphics = { version = "0.0.2", registry = "strafesnet" }
 strafesnet_roblox_bot_file = { version = "0.8.1", registry = "strafesnet" }
 strafesnet_snf = { version = "0.3.2", registry = "strafesnet" }

lib/src/lib.rs

@@ -1,7 +1,6 @@
 pub mod bot;
 pub mod graphics;
 pub mod head;
-pub mod setup;
 pub mod surface;
 
 // Create Surface

lib/src/setup.rs

@@ -1,112 +0,0 @@
-fn optional_features()->wgpu::Features{
-	wgpu::Features::TEXTURE_COMPRESSION_ASTC
-	|wgpu::Features::TEXTURE_COMPRESSION_ETC2
-}
-fn required_features()->wgpu::Features{
-	wgpu::Features::TEXTURE_COMPRESSION_BC
-}
-fn required_downlevel_capabilities()->wgpu::DownlevelCapabilities{
-	wgpu::DownlevelCapabilities{
-		flags:wgpu::DownlevelFlags::empty(),
-		shader_model:wgpu::ShaderModel::Sm5,
-		..wgpu::DownlevelCapabilities::default()
-	}
-}
-
-pub mod step1{
-	pub fn create_instance()->wgpu::Instance{
-		Default::default()
-	}
-}
-
-pub mod step2{
-	pub fn create_surface<'window>(instance:&wgpu::Instance,target:impl Into<wgpu::SurfaceTarget<'window>>)->Result<wgpu::Surface<'window>,wgpu::CreateSurfaceError>{
-		instance.create_surface(target)
-	}
-}
-
-pub mod step3{
-	pub async fn pick_adapter(instance:&wgpu::Instance,surface:&wgpu::Surface<'_>)->Option<wgpu::Adapter>{
-		let backends=wgpu::Backends::from_env().unwrap_or_default();
-		//TODO: prefer adapter that implements optional features
-		//let optional_features=optional_features();
-		let required_features=super::required_features();
-		let required_downlevel_capabilities=super::required_downlevel_capabilities();
-
-		//no helper function smh gotta write it myself
-		let adapters=instance.enumerate_adapters(backends).await;
-
-		let adapter=adapters.into_iter()
-			// reverse because we want to select adapters that appear first in ties,
-			// and max_by_key selects the last equal element in the iterator.
-			.rev()
-			.filter(|adapter|
-				adapter.is_surface_supported(surface)
-				&&adapter.features().contains(required_features)
-				&&{
-					let downlevel_capabilities=adapter.get_downlevel_capabilities();
-					downlevel_capabilities.shader_model>=required_downlevel_capabilities.shader_model
-					&&downlevel_capabilities.flags.contains(required_downlevel_capabilities.flags)
-				}
-			)
-			.max_by_key(|adapter|match adapter.get_info().device_type{
-				wgpu::DeviceType::IntegratedGpu=>3,
-				wgpu::DeviceType::DiscreteGpu=>4,
-				wgpu::DeviceType::VirtualGpu=>2,
-				wgpu::DeviceType::Other|wgpu::DeviceType::Cpu=>1,
-			})?;
-
-		let adapter_info=adapter.get_info();
-		println!("Using {} ({:?})", adapter_info.name, adapter_info.backend);
-
-		Some(adapter)
-	}
-}
-
-pub mod step4{
-	pub async fn request_device(adapter:&wgpu::Adapter)->(wgpu::Device,wgpu::Queue){
-		let optional_features=super::optional_features();
-		let required_features=super::required_features();
-
-		// Make sure we use the texture resolution limits from the adapter, so we can support images the size of the surface.
-		let needed_limits=strafesnet_graphics::graphics::required_limits().using_resolution(adapter.limits());
-
-		let (device, queue)=adapter
-			.request_device(
-				&wgpu::DeviceDescriptor{
-					label:None,
-					required_features:(optional_features&adapter.features())|required_features,
-					required_limits:needed_limits,
-					memory_hints:wgpu::MemoryHints::Performance,
-					trace:wgpu::Trace::Off,
-					experimental_features:wgpu::ExperimentalFeatures::disabled(),
-				},
-			).await
-			.expect("Unable to find a suitable GPU adapter!");
-
-		(
-			device,
-			queue,
-		)
-	}
-}
-
-pub mod step5{
-	pub fn configure_surface(
-		adapter:&wgpu::Adapter,
-		device:&wgpu::Device,
-		surface:&wgpu::Surface<'_>,
-		(width,height):(u32,u32),
-	)->wgpu::SurfaceConfiguration{
-		let mut config=surface
-			.get_default_config(adapter, width, height)
-			.expect("Surface isn't supported by the adapter.");
-
-		let surface_view_format=config.format.add_srgb_suffix();
-		config.view_formats.push(surface_view_format);
-		config.present_mode=wgpu::PresentMode::AutoNoVsync;
-		surface.configure(device,&config);
-
-		config
-	}
-}

native-player/src/setup.rs

@@ -1,4 +1,4 @@
-use strafesnet_roblox_bot_player::setup;
+use strafesnet_graphics::setup;
 
 fn create_window(title:&str,event_loop:&winit::event_loop::EventLoop<()>)->Result<winit::window::Window,winit::error::OsError>{
 	let mut attr=winit::window::WindowAttributes::default();

wasm-module/src/lib.rs

@@ -1,6 +1,7 @@
 use wasm_bindgen::prelude::wasm_bindgen;
 use wasm_bindgen::JsValue;
-use strafesnet_roblox_bot_player::{bot,graphics,head,setup};
+use strafesnet_roblox_bot_player::{bot,graphics,head};
+use strafesnet_graphics::setup;
 use strafesnet_common::session::Time as SessionTime;
 
 struct ToSurfaceTarget{