diff --git a/examples/17-drawstress/drawstress.cpp b/examples/17-drawstress/drawstress.cpp
index 43101514..947edfba 100644
--- a/examples/17-drawstress/drawstress.cpp
+++ b/examples/17-drawstress/drawstress.cpp
@@ -74,6 +74,7 @@ uint32_t reset = BGFX_RESET_NONE;
 bool autoAdjust = true;
 int32_t scrollArea = 0;
 int32_t dim = 16;
+int32_t maxDim = 40;
 uint32_t transform = 0;
 
 entry::MouseState mouseState;
@@ -118,7 +119,7 @@ BX_NO_INLINE bool mainloop()
 			{
 				if (deltaTimeAvgNs < highwm)
 				{
-					dim = bx::uint32_min(dim + 2, 40);
+					dim = bx::uint32_min(dim + 2, maxDim);
 				}
 				else if (deltaTimeAvgNs > lowwm)
 				{
@@ -159,7 +160,7 @@ BX_NO_INLINE bool mainloop()
 			autoAdjust ^= true;
 		}
 
-		imguiSlider("Dim", dim, 5, 40);
+		imguiSlider("Dim", dim, 5, maxDim);
 		imguiLabel("Draw calls: %d", dim*dim*dim);
 		imguiLabel("Avg Delta Time (1 second) [ms]: %0.4f", deltaTimeAvgNs/1000.0f);
 
@@ -255,6 +256,9 @@ int _main_(int /*_argc*/, char** /*_argv*/)
 	bgfx::init();
 	bgfx::reset(width, height, reset);
 
+	const bgfx::Caps* caps = bgfx::getCaps();
+	maxDim = (int32_t)powf(caps->maxDrawCalls, 1.0/3.0);
+
 	// Enable debug text.
 	bgfx::setDebug(debug);
 
diff --git a/include/bgfx.c99.h b/include/bgfx.c99.h
index 307fc4fd..59928105 100644
--- a/include/bgfx.c99.h
+++ b/include/bgfx.c99.h
@@ -305,9 +305,9 @@ typedef struct bgfx_caps
      */
     uint64_t supported;
 
+    uint32_t maxDrawCalls;      /* < Maximum draw calls.               */
     uint16_t maxTextureSize;    /* < Maximum texture size.             */
     uint16_t maxViews;          /* < Maximum views.                    */
-    uint16_t maxDrawCalls;      /* < Maximum draw calls.               */
     uint8_t  maxFBAttachments;  /* < Maximum frame buffer attachments. */
     uint8_t  numGPUs;           /* <                                   */
 
diff --git a/include/bgfx.h b/include/bgfx.h
index e2dd12d8..b5cb7e45 100644
--- a/include/bgfx.h
+++ b/include/bgfx.h
@@ -314,9 +314,9 @@ namespace bgfx
 		///
 		uint64_t supported;
 
+		uint32_t maxDrawCalls;     ///< Maximum draw calls.
 		uint16_t maxTextureSize;   ///< Maximum texture size.
 		uint16_t maxViews;         ///< Maximum views.
-		uint16_t maxDrawCalls;     ///< Maximum draw calls.
 		uint8_t  maxFBAttachments; ///< Maximum frame buffer attachments.
 		uint8_t  numGPUs; ///<