Unify ResolvedSurfaceOutput into SurfaceOutput

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

Author: sagudev

deno_webgpu/surface.rs

@@ -96,7 +96,7 @@ pub fn op_webgpu_surface_get_current_texture(
 
     match output.status {
         wgpu_types::SurfaceStatus::Good | wgpu_types::SurfaceStatus::Suboptimal => {
-            let id = output.texture_id.unwrap();
+            let id = output.texture.unwrap();
             let rid = state.resource_table.add(crate::texture::WebGpuTexture {
                 instance: instance.clone(),
                 id,

player/src/lib.rs

@@ -289,7 +289,7 @@ impl GlobalPlay for wgc::global::Global {
             Action::GetSurfaceTexture { id, parent_id } => {
                 self.surface_get_current_texture(parent_id, Some(id))
                     .unwrap()
-                    .texture_id
+                    .texture
                     .unwrap();
             }
             Action::CreateBindGroupLayout(id, desc) => {

wgpu-core/src/present.rs

@@ -103,17 +103,13 @@ impl From<WaitIdleError> for ConfigureSurfaceError {
     }
 }
 
-#[derive(Debug)]
-pub struct ResolvedSurfaceOutput {
-    pub status: Status,
-    pub texture: Option<Arc<resource::Texture>>,
-}
+pub type ResolvedSurfaceOutput = SurfaceOutput<Arc<resource::Texture>>;
 
 #[repr(C)]
 #[derive(Debug)]
-pub struct SurfaceOutput {
+pub struct SurfaceOutput<T = id::TextureId> {
     pub status: Status,
-    pub texture_id: Option<id::TextureId>,
+    pub texture: Option<T>,
 }
 
 impl Surface {
@@ -337,7 +333,10 @@ impl Global {
             .texture
             .map(|texture| fid.assign(resource::Fallible::Valid(texture)));
 
-        Ok(SurfaceOutput { status, texture_id })
+        Ok(SurfaceOutput {
+            status,
+            texture: texture_id,
+        })
     }
 
     pub fn surface_present(&self, surface_id: id::SurfaceId) -> Result<Status, SurfaceError> {

wgpu/src/backend/wgpu_core.rs

@@ -3484,7 +3484,10 @@ impl dispatch::SurfaceInterface for CoreSurface {
         .into();
 
         match self.context.0.surface_get_current_texture(self.id, None) {
-            Ok(wgc::present::SurfaceOutput { status, texture_id }) => {
+            Ok(wgc::present::SurfaceOutput {
+                status,
+                texture: texture_id,
+            }) => {
                 let data = texture_id
                     .map(|id| CoreTexture {
                         context: self.context.clone(),