nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-22 14:55:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[gles] consolidate z offset selection

Browse Source
This commit is contained in:
teoxoy 2023-10-13 20:37:35 +02:00 committed by Connor Fitzgerald
parent 8e42ef002c
commit b5e578bd0b
1 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
wgpu-hal/src/gles/queue.rs
View File

@ -28,6 +28,14 @@ fn get_2d_target(target: u32, array_layer: u32) -> u32 {
} }
} }
fn get_z_offset(target: u32, base: &crate::TextureCopyBase) -> u32 {
match target {
glow::TEXTURE_2D_ARRAY | glow::TEXTURE_CUBE_MAP_ARRAY => base.array_layer,
glow::TEXTURE_3D => base.origin.z,
_ => unreachable!(),
}
}
impl super::Queue { impl super::Queue {
/// Performs a manual shader clear, used as a workaround for a clearing bug on mesa /// Performs a manual shader clear, used as a workaround for a clearing bug on mesa
unsafe fn perform_shader_clear(&self, gl: &glow::Context, draw_buffer: u32, color: [f32; 4]) { unsafe fn perform_shader_clear(&self, gl: &glow::Context, draw_buffer: u32, color: [f32; 4]) {
@ -380,12 +388,7 @@ impl super::Queue {
unsafe { gl.bind_texture(dst_target, Some(dst)) }; unsafe { gl.bind_texture(dst_target, Some(dst)) };
let format_desc = self.shared.describe_texture_format(dst_format); let format_desc = self.shared.describe_texture_format(dst_format);
if is_layered_target(dst_target) { if is_layered_target(dst_target) {
let z_offset = let z_offset = get_z_offset(dst_target, &copy.dst_base);
if let glow::TEXTURE_2D_ARRAY | glow::TEXTURE_CUBE_MAP_ARRAY = dst_target {
copy.dst_base.array_layer as i32
} else {
copy.dst_base.origin.z as i32
};
match src.source { match src.source {
wgt::ExternalImageSource::ImageBitmap(ref b) => unsafe { wgt::ExternalImageSource::ImageBitmap(ref b) => unsafe {
@ -394,7 +397,7 @@ impl super::Queue {
copy.dst_base.mip_level as i32, copy.dst_base.mip_level as i32,
copy.dst_base.origin.x as i32, copy.dst_base.origin.x as i32,
copy.dst_base.origin.y as i32, copy.dst_base.origin.y as i32,
z_offset, z_offset as i32,
copy.size.width as i32, copy.size.width as i32,
copy.size.height as i32, copy.size.height as i32,
copy.size.depth as i32, copy.size.depth as i32,
@ -409,7 +412,7 @@ impl super::Queue {
copy.dst_base.mip_level as i32, copy.dst_base.mip_level as i32,
copy.dst_base.origin.x as i32, copy.dst_base.origin.x as i32,
copy.dst_base.origin.y as i32, copy.dst_base.origin.y as i32,
z_offset, z_offset as i32,
copy.size.width as i32, copy.size.width as i32,
copy.size.height as i32, copy.size.height as i32,
copy.size.depth as i32, copy.size.depth as i32,
@ -424,7 +427,7 @@ impl super::Queue {
copy.dst_base.mip_level as i32, copy.dst_base.mip_level as i32,
copy.dst_base.origin.x as i32, copy.dst_base.origin.x as i32,
copy.dst_base.origin.y as i32, copy.dst_base.origin.y as i32,
z_offset, z_offset as i32,
copy.size.width as i32, copy.size.width as i32,
copy.size.height as i32, copy.size.height as i32,
copy.size.depth as i32, copy.size.depth as i32,
@ -531,13 +534,7 @@ impl super::Queue {
copy.dst_base.mip_level as i32, copy.dst_base.mip_level as i32,
copy.dst_base.origin.x as i32, copy.dst_base.origin.x as i32,
copy.dst_base.origin.y as i32, copy.dst_base.origin.y as i32,
if let glow::TEXTURE_2D_ARRAY | glow::TEXTURE_CUBE_MAP_ARRAY = get_z_offset(dst_target, &copy.dst_base) as i32,
dst_target
{
copy.dst_base.array_layer as i32
} else {
copy.dst_base.origin.z as i32
},
copy.src_base.origin.x as i32, copy.src_base.origin.x as i32,
copy.src_base.origin.y as i32, copy.src_base.origin.y as i32,
copy.size.width as i32, copy.size.width as i32,
@ -605,13 +602,7 @@ impl super::Queue {
copy.texture_base.mip_level as i32, copy.texture_base.mip_level as i32,
copy.texture_base.origin.x as i32, copy.texture_base.origin.x as i32,
copy.texture_base.origin.y as i32, copy.texture_base.origin.y as i32,
if let glow::TEXTURE_2D_ARRAY | glow::TEXTURE_CUBE_MAP_ARRAY = get_z_offset(dst_target, &copy.texture_base) as i32,
dst_target
{
copy.texture_base.array_layer as i32
} else {
copy.texture_base.origin.z as i32
},
copy.size.width as i32, copy.size.width as i32,
copy.size.height as i32, copy.size.height as i32,
copy.size.depth as i32, copy.size.depth as i32,
@ -677,13 +668,7 @@ impl super::Queue {
copy.texture_base.mip_level as i32, copy.texture_base.mip_level as i32,
copy.texture_base.origin.x as i32, copy.texture_base.origin.x as i32,
copy.texture_base.origin.y as i32, copy.texture_base.origin.y as i32,
if let glow::TEXTURE_2D_ARRAY | glow::TEXTURE_CUBE_MAP_ARRAY = get_z_offset(dst_target, &copy.texture_base) as i32,
dst_target
{
copy.texture_base.array_layer as i32
} else {
copy.texture_base.origin.z as i32
},
copy.size.width as i32, copy.size.width as i32,
copy.size.height as i32, copy.size.height as i32,
copy.size.depth as i32, copy.size.depth as i32,