From 9446cda10e1a1b82e08d94c9c43a3e024e55c655 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Fri, 10 Jan 2025 03:23:57 +0100 Subject: ui still no work --- client/src/ui.rs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'client/src/ui.rs') diff --git a/client/src/ui.rs b/client/src/ui.rs index 3687276..69f1081 100644 --- a/client/src/ui.rs +++ b/client/src/ui.rs @@ -24,13 +24,12 @@ use std::{collections::HashMap, num::NonZeroU64}; use wgpu::{ BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout, BindGroupLayoutDescriptor, BindGroupLayoutEntry, BindingResource, BindingType, BlendState, Buffer, BufferDescriptor, - BufferUsages, Color, ColorTargetState, ColorWrites, CommandEncoder, CompareFunction, - DepthBiasState, DepthStencilState, Device, Extent3d, FragmentState, FrontFace, IndexFormat, - LoadOp, MultisampleState, Operations, PipelineCompilationOptions, PipelineLayoutDescriptor, - PolygonMode, PrimitiveState, PrimitiveTopology, PushConstantRange, Queue, - RenderPassColorAttachment, RenderPassDescriptor, RenderPipeline, RenderPipelineDescriptor, - SamplerBindingType, SamplerDescriptor, ShaderStages, StencilState, StoreOp, Texture, - TextureDescriptor, TextureDimension, TextureFormat, TextureSampleType, TextureUsages, + BufferUsages, ColorTargetState, ColorWrites, CommandEncoder, Device, Extent3d, FragmentState, + FrontFace, IndexFormat, LoadOp, MultisampleState, Operations, PipelineCompilationOptions, + PipelineLayoutDescriptor, PolygonMode, PrimitiveState, PrimitiveTopology, PushConstantRange, + Queue, RenderPassColorAttachment, RenderPassDescriptor, RenderPipeline, + RenderPipelineDescriptor, SamplerBindingType, SamplerDescriptor, ShaderStages, StoreOp, + Texture, TextureDescriptor, TextureDimension, TextureFormat, TextureSampleType, TextureUsages, TextureView, TextureViewDescriptor, TextureViewDimension, VertexAttribute, VertexBufferLayout, VertexFormat, VertexState, VertexStepMode, include_wgsl, util::{DeviceExt, TextureDataOrder}, @@ -122,7 +121,7 @@ impl UiRenderer { shader_location: 1, }, VertexAttribute { - format: VertexFormat::Float32x3, + format: VertexFormat::Uint32, offset: size_of::() as u64 * 4, shader_location: 2, }, -- cgit v1.2.3-70-g09d2