From 5002e4a590c9dda238ddea599b16a010c2b15c50 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Mon, 2 Jun 2025 20:20:03 -0400 Subject: [PATCH] Simplify shader reading --- src/shpk.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/shpk.rs b/src/shpk.rs index cb458b9..4572e8c 100644 --- a/src/shpk.rs +++ b/src/shpk.rs @@ -63,14 +63,9 @@ pub struct Shader { #[br(args { count: texture_count as usize, inner: ResourceParameterBinReadArgs { strings_offset }})] pub texture_parameters: Vec, - /// Additional data specific to the shader type - #[br(seek_before = SeekFrom::Start(shader_data_offset as u64 + data_offset as u64))] - #[br(count = if is_vertex { shader_data_offset } else { 0 } )] - #[br(restore_position)] - pub additional_data: Vec, - /// The HLSL bytecode of this shader. The DX level used varies. - #[br(seek_before = SeekFrom::Start(shader_data_offset as u64 + data_offset as u64 + if is_vertex { 8 } else { 0 } ))] + // TODO: dx9 is 4, not 8 + #[br(seek_before = SeekFrom::Start(shader_data_offset as u64 + data_offset as u64 + if is_vertex { 8 } else { 0 }))] #[br(count = data_size)] #[br(restore_position)] pub bytecode: Vec,