From 6416bc5b68d7a676c8fa8f3998da0e630d47af01 Mon Sep 17 00:00:00 2001
From: Aron Granberg <aron.granberg@gmail.com>
Date: Sun, 27 Jun 2021 17:08:49 +0200
Subject: [PATCH 1/2] Fix check for QUERY_SET_MAX_QUERIES was using >= instead
 of >

---
 wgpu-core/src/device/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs
index 0bfe1b7623..6a087d0466 100644
--- a/wgpu-core/src/device/mod.rs
+++ b/wgpu-core/src/device/mod.rs
@@ -2270,7 +2270,7 @@ impl<A: HalApi> Device<A> {
             return Err(Error::ZeroCount);
         }
 
-        if desc.count >= wgt::QUERY_SET_MAX_QUERIES {
+        if desc.count > wgt::QUERY_SET_MAX_QUERIES {
             return Err(Error::TooManyQueries {
                 count: desc.count,
                 maximum: wgt::QUERY_SET_MAX_QUERIES,

From f0919141e2254416c06094536daeaf3bfcb106c1 Mon Sep 17 00:00:00 2001
From: Aron Granberg <aron.granberg@gmail.com>
Date: Sun, 27 Jun 2021 17:17:12 +0200
Subject: [PATCH 2/2] Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3aea6d9c37..cdcbcd72a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## Unreleased
+  - Fixed:
+    - `Device::create_query_set` would return an error when creating exactly `QUERY_SET_MAX_QUERIES` (8192) queries. Now it only returns an error when trying to create *more* than `QUERY_SET_MAX_QUERIES` queries.
+
 ## v0.9 (2021-06-18)
   - Updated:
     - naga to `v0.5`.