fix(core): validate TIMESTAMP_QUERY feature before other query set validation in pass creation

Author: ErichDonGubler

wgpu-core/src/command/compute.rs

@@ -309,21 +309,23 @@ impl Global {
         };
 
         arc_desc.timestamp_writes = if let Some(tw) = desc.timestamp_writes {
+            match cmd_buf
+                .device
+                .require_features(wgt::Features::TIMESTAMP_QUERY)
+            {
+                Ok(()) => (),
+                Err(e) => return make_err(e.into(), arc_desc),
+            }
+
             let query_set = match hub.query_sets.get(tw.query_set).get() {
                 Ok(query_set) => query_set,
                 Err(e) => return make_err(e.into(), arc_desc),
             };
+
             match query_set.same_device(&cmd_buf.device) {
                 Ok(()) => (),
                 Err(e) => return make_err(e.into(), arc_desc),
             }
-            match cmd_buf
-                .device
-                .require_features(wgt::Features::TIMESTAMP_QUERY)
-            {
-                Ok(()) => (),
-                Err(e) => return make_err(e.into(), arc_desc),
-            }
 
             Some(ArcPassTimestampWrites {
                 query_set,

wgpu-core/src/command/render.rs

@@ -1393,10 +1393,11 @@ impl Global {
 
             arc_desc.timestamp_writes = if let Some(tw) = desc.timestamp_writes {
                 let query_set = query_sets.get(tw.query_set).get()?;
-                query_set.same_device(device)?;
 
                 device.require_features(wgt::Features::TIMESTAMP_QUERY)?;
 
+                query_set.same_device(device)?;
+
                 Some(ArcPassTimestampWrites {
                     query_set,
                     beginning_of_pass_write_index: tw.beginning_of_pass_write_index,