diff --git a/docs/python_api/qrenderdoc/windows.rst b/docs/python_api/qrenderdoc/windows.rst
index 12142e9b3..c21e65b18 100644
--- a/docs/python_api/qrenderdoc/windows.rst
+++ b/docs/python_api/qrenderdoc/windows.rst
@@ -121,3 +121,10 @@ Pixel History
 .. autoclass:: qrenderdoc.PixelHistoryView
   :members:
 
+
+Shader Message Viewer
+---------------------
+
+.. autoclass:: qrenderdoc.ShaderMessageViewer
+  :members:
+
diff --git a/docs/python_api/renderdoc/pipelines/common.rst b/docs/python_api/renderdoc/pipelines/common.rst
index 05242c23e..829f46a3d 100644
--- a/docs/python_api/renderdoc/pipelines/common.rst
+++ b/docs/python_api/renderdoc/pipelines/common.rst
@@ -133,3 +133,23 @@ Blending
 .. autoclass:: renderdoc.LogicOperation
   :members:
 
+Shader Messages
+---------------
+
+.. autoclass:: renderdoc.ShaderMessage
+  :members:
+
+.. autoclass:: renderdoc.ShaderMessageLocation
+  :members:
+
+.. autoclass:: renderdoc.ShaderVertexMessageLocation
+  :members:
+
+.. autoclass:: renderdoc.ShaderPixelMessageLocation
+  :members:
+
+.. autoclass:: renderdoc.ShaderComputeMessageLocation
+  :members:
+
+
+* qrenderdoc.ShaderMessageViewer