diff --git a/docs/python_api/renderdoc/analysis.rst b/docs/python_api/renderdoc/analysis.rst
index d1e2938ea..727c12d58 100644
--- a/docs/python_api/renderdoc/analysis.rst
+++ b/docs/python_api/renderdoc/analysis.rst
@@ -80,3 +80,9 @@ Pixel History
 
 .. autoclass:: PixelValue
   :members:
+
+Shader Debuging
+---------------
+
+.. autoclass:: DebugPixelInputs
+  :members:
diff --git a/qrenderdoc/Windows/PixelHistoryView.cpp b/qrenderdoc/Windows/PixelHistoryView.cpp
index 294014417..2185fb2ce 100644
--- a/qrenderdoc/Windows/PixelHistoryView.cpp
+++ b/qrenderdoc/Windows/PixelHistoryView.cpp
@@ -767,8 +767,10 @@ void PixelHistoryView::startDebug(EventTag tag)
   ShaderDebugTrace *trace = NULL;
 
   m_Ctx.Replay().AsyncInvoke([this, &trace, &done, tag](IReplayController *r) {
-    trace = r->DebugPixel((uint32_t)m_Pixel.x(), (uint32_t)m_Pixel.y(),
-                          m_Display.subresource.sample, tag.primitive);
+    DebugPixelInputs inputs;
+    inputs.sample = m_Display.subresource.sample;
+    inputs.primitive = tag.primitive;
+    trace = r->DebugPixel((uint32_t)m_Pixel.x(), (uint32_t)m_Pixel.y(), inputs);
 
     if(trace->debugger == NULL)
     {
diff --git a/qrenderdoc/Windows/ShaderMessageViewer.cpp b/qrenderdoc/Windows/ShaderMessageViewer.cpp
index 1397edd1f..28a3735cb 100644
--- a/qrenderdoc/Windows/ShaderMessageViewer.cpp
+++ b/qrenderdoc/Windows/ShaderMessageViewer.cpp
@@ -337,13 +337,22 @@ ShaderMessageViewer::ShaderMessageViewer(ICaptureContext &ctx, ShaderStageMask s
 
       m_Ctx.Replay().AsyncInvoke([&trace, &done, msg](IReplayController *r) {
         if(msg.stage == ShaderStage::Compute)
+        {
           trace = r->DebugThread(msg.location.compute.workgroup, msg.location.compute.thread);
+        }
         else if(msg.stage == ShaderStage::Vertex)
+        {
           trace = r->DebugVertex(msg.location.vertex.vertexIndex, msg.location.vertex.instance,
                                  msg.location.vertex.vertexIndex, msg.location.vertex.view);
+        }
         else if(msg.stage == ShaderStage::Pixel)
-          trace = r->DebugPixel(msg.location.pixel.x, msg.location.pixel.y,
-                                msg.location.pixel.sample, msg.location.pixel.primitive);
+        {
+          DebugPixelInputs inputs;
+          inputs.sample = msg.location.pixel.sample;
+          inputs.primitive = msg.location.pixel.primitive;
+          inputs.view = msg.location.pixel.view;
+          trace = r->DebugPixel(msg.location.pixel.x, msg.location.pixel.y, inputs);
+        }
 
         if(trace && trace->debugger == NULL)
         {
diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp
index cd30fe561..c138a94a3 100644
--- a/qrenderdoc/Windows/TextureViewer.cpp
+++ b/qrenderdoc/Windows/TextureViewer.cpp
@@ -4099,7 +4099,9 @@ void TextureViewer::on_debugPixelContext_clicked()
   ShaderDebugTrace *trace = NULL;
 
   m_Ctx.Replay().AsyncInvoke([this, &trace, &done, x, y](IReplayController *r) {
-    trace = r->DebugPixel((uint32_t)x, (uint32_t)y, m_TexDisplay.subresource.sample, ~0U);
+    DebugPixelInputs inputs;
+    inputs.sample = m_TexDisplay.subresource.sample;
+    trace = r->DebugPixel((uint32_t)x, (uint32_t)y, inputs);
 
     if(trace->debugger == NULL)
     {
diff --git a/renderdoc/api/replay/data_types.h b/renderdoc/api/replay/data_types.h
index 4ed50cffb..11a308d91 100644
--- a/renderdoc/api/replay/data_types.h
+++ b/renderdoc/api/replay/data_types.h
@@ -2235,3 +2235,23 @@ struct Thumbnail
 };
 
 DECLARE_REFLECTION_STRUCT(Thumbnail);
+
+DOCUMENT(
+    "Contains the properties used to select which fragment to debug, used as an input to "
+    "DebugPixel.");
+struct DebugPixelInputs
+{
+  DOCUMENT("");
+  DebugPixelInputs() : sample(~0U), primitive(~0U), view(~0U) {}
+  DebugPixelInputs(const DebugPixelInputs &) = default;
+  DebugPixelInputs &operator=(const DebugPixelInputs &) = default;
+
+  DOCUMENT("The multi-sampled sample.");
+  uint32_t sample;
+  DOCUMENT("The primitive index.");
+  uint32_t primitive;
+  DOCUMENT("The layered or multiview rendering view index.");
+  uint32_t view;
+};
+
+DECLARE_REFLECTION_STRUCT(DebugPixelInputs);
diff --git a/renderdoc/api/replay/renderdoc_replay.h b/renderdoc/api/replay/renderdoc_replay.h
index 5b678f9cb..bbbf78d65 100644
--- a/renderdoc/api/replay/renderdoc_replay.h
+++ b/renderdoc/api/replay/renderdoc_replay.h
@@ -967,15 +967,16 @@ bucket when the pixel values are divided between ``minval`` and ``maxval``.
 
 :param int x: The x co-ordinate.
 :param int y: The y co-ordinate.
-:param int sample: The multi-sampled sample. Ignored if non-multisampled texture.
-:param int primitive: Debug the pixel from this primitive if there's ambiguity. If set to
+:param DebugPixelInputs inputs: Specific properties to select which fragment to debug e.g.
+  sample: The multi-sampled sample. Ignored if non-multisampled texture.
+  primitive: Debug the pixel from this primitive if there's ambiguity. If set to
   :data:`NoPreference` then a random fragment writing to the given co-ordinate is debugged.
-:return: The resulting trace resulting from debugging. Destroy with
-  :meth:`FreeTrace`.
+  view: Debug the fragment writing to this view for layered or multiview rendering, 
+  ignored if set to :data:`NoPreference`.
+:return: The resulting trace resulting from debugging. Destroy with :meth:`FreeTrace`.
 :rtype: ShaderDebugTrace
 )");
-  virtual ShaderDebugTrace *DebugPixel(uint32_t x, uint32_t y, uint32_t sample,
-                                       uint32_t primitive) = 0;
+  virtual ShaderDebugTrace *DebugPixel(uint32_t x, uint32_t y, const DebugPixelInputs &inputs) = 0;
 
   DOCUMENT(R"(Retrieve a debugging trace from running a compute thread.
 
diff --git a/renderdoc/core/image_viewer.cpp b/renderdoc/core/image_viewer.cpp
index 060b7adde..94d4dea32 100644
--- a/renderdoc/core/image_viewer.cpp
+++ b/renderdoc/core/image_viewer.cpp
@@ -318,8 +318,8 @@ public:
   {
     return new ShaderDebugTrace();
   }
-  ShaderDebugTrace *DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample,
-                               uint32_t primitive)
+  ShaderDebugTrace *DebugPixel(uint32_t eventId, uint32_t x, uint32_t y,
+                               const DebugPixelInputs &inputs)
   {
     return new ShaderDebugTrace();
   }
diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp
index 0bab3b523..f0822847f 100644
--- a/renderdoc/core/replay_proxy.cpp
+++ b/renderdoc/core/replay_proxy.cpp
@@ -1577,7 +1577,7 @@ ShaderDebugTrace *ReplayProxy::DebugVertex(uint32_t eventId, uint32_t vertid, ui
 template <typename ParamSerialiser, typename ReturnSerialiser>
 ShaderDebugTrace *ReplayProxy::Proxied_DebugPixel(ParamSerialiser &paramser, ReturnSerialiser &retser,
                                                   uint32_t eventId, uint32_t x, uint32_t y,
-                                                  uint32_t sample, uint32_t primitive)
+                                                  const DebugPixelInputs &inputs)
 {
   const ReplayProxyPacket expectedPacket = eReplayProxy_DebugPixel;
   ReplayProxyPacket packet = eReplayProxy_DebugPixel;
@@ -1588,15 +1588,14 @@ ShaderDebugTrace *ReplayProxy::Proxied_DebugPixel(ParamSerialiser &paramser, Ret
     SERIALISE_ELEMENT(eventId);
     SERIALISE_ELEMENT(x);
     SERIALISE_ELEMENT(y);
-    SERIALISE_ELEMENT(sample);
-    SERIALISE_ELEMENT(primitive);
+    SERIALISE_ELEMENT(inputs);
     END_PARAMS();
   }
 
   {
     REMOTE_EXECUTION();
     if(paramser.IsReading() && !paramser.IsErrored() && !m_IsErrored)
-      ret = m_Remote->DebugPixel(eventId, x, y, sample, primitive);
+      ret = m_Remote->DebugPixel(eventId, x, y, inputs);
     else
       ret = new ShaderDebugTrace;
   }
@@ -1606,10 +1605,10 @@ ShaderDebugTrace *ReplayProxy::Proxied_DebugPixel(ParamSerialiser &paramser, Ret
   return ret;
 }
 
-ShaderDebugTrace *ReplayProxy::DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample,
-                                          uint32_t primitive)
+ShaderDebugTrace *ReplayProxy::DebugPixel(uint32_t eventId, uint32_t x, uint32_t y,
+                                          const DebugPixelInputs &inputs)
 {
-  PROXY_FUNCTION(DebugPixel, eventId, x, y, sample, primitive);
+  PROXY_FUNCTION(DebugPixel, eventId, x, y, inputs);
 }
 
 template <typename ParamSerialiser, typename ReturnSerialiser>
@@ -2948,7 +2947,7 @@ bool ReplayProxy::Tick(int type)
     case eReplayProxy_ReplaceResource: ReplaceResource(ResourceId(), ResourceId()); break;
     case eReplayProxy_RemoveReplacement: RemoveReplacement(ResourceId()); break;
     case eReplayProxy_DebugVertex: DebugVertex(0, 0, 0, 0, 0); break;
-    case eReplayProxy_DebugPixel: DebugPixel(0, 0, 0, 0, 0); break;
+    case eReplayProxy_DebugPixel: DebugPixel(0, 0, 0, DebugPixelInputs()); break;
     case eReplayProxy_DebugThread:
     {
       DebugThread(0, {}, {});
diff --git a/renderdoc/core/replay_proxy.h b/renderdoc/core/replay_proxy.h
index e942822c7..8ebf01496 100644
--- a/renderdoc/core/replay_proxy.h
+++ b/renderdoc/core/replay_proxy.h
@@ -533,7 +533,7 @@ public:
   IMPLEMENT_FUNCTION_PROXIED(ShaderDebugTrace *, DebugVertex, uint32_t eventId, uint32_t vertid,
                              uint32_t instid, uint32_t idx, uint32_t view);
   IMPLEMENT_FUNCTION_PROXIED(ShaderDebugTrace *, DebugPixel, uint32_t eventId, uint32_t x,
-                             uint32_t y, uint32_t sample, uint32_t primitive);
+                             uint32_t y, const DebugPixelInputs &inputs);
   IMPLEMENT_FUNCTION_PROXIED(ShaderDebugTrace *, DebugThread, uint32_t eventId,
                              const rdcfixedarray<uint32_t, 3> &groupid,
                              const rdcfixedarray<uint32_t, 3> &threadid);
diff --git a/renderdoc/driver/d3d11/d3d11_replay.h b/renderdoc/driver/d3d11/d3d11_replay.h
index a27805444..ffd8457b5 100644
--- a/renderdoc/driver/d3d11/d3d11_replay.h
+++ b/renderdoc/driver/d3d11/d3d11_replay.h
@@ -275,8 +275,8 @@ public:
                                            uint32_t y, const Subresource &sub, CompType typeCast);
   ShaderDebugTrace *DebugVertex(uint32_t eventId, uint32_t vertid, uint32_t instid, uint32_t idx,
                                 uint32_t view);
-  ShaderDebugTrace *DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample,
-                               uint32_t primitive);
+  ShaderDebugTrace *DebugPixel(uint32_t eventId, uint32_t x, uint32_t y,
+                               const DebugPixelInputs &inputs);
   ShaderDebugTrace *DebugThread(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
                                 const rdcfixedarray<uint32_t, 3> &threadid);
   rdcarray<ShaderDebugState> ContinueDebug(ShaderDebugger *debugger);
diff --git a/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp b/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp
index 62ad5dc69..61a28708c 100644
--- a/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp
+++ b/renderdoc/driver/d3d11/d3d11_shaderdebug.cpp
@@ -1791,12 +1791,15 @@ ShaderDebugTrace *D3D11Replay::DebugVertex(uint32_t eventId, uint32_t vertid, ui
   return ret;
 }
 
-ShaderDebugTrace *D3D11Replay::DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample,
-                                          uint32_t primitive)
+ShaderDebugTrace *D3D11Replay::DebugPixel(uint32_t eventId, uint32_t x, uint32_t y,
+                                          const DebugPixelInputs &inputs)
 {
   using namespace DXBCBytecode;
   using namespace DXBCDebug;
 
+  uint32_t sample = inputs.sample;
+  uint32_t primitive = inputs.primitive;
+
   D3D11MarkerRegion region(
       StringFormat::Fmt("DebugPixel @ %u of (%u,%u) %u / %u", eventId, x, y, sample, primitive));
 
diff --git a/renderdoc/driver/d3d12/d3d12_replay.h b/renderdoc/driver/d3d12/d3d12_replay.h
index 5a8db51ea..3748807c1 100644
--- a/renderdoc/driver/d3d12/d3d12_replay.h
+++ b/renderdoc/driver/d3d12/d3d12_replay.h
@@ -234,8 +234,8 @@ public:
                                            uint32_t y, const Subresource &sub, CompType typeCast);
   ShaderDebugTrace *DebugVertex(uint32_t eventId, uint32_t vertid, uint32_t instid, uint32_t idx,
                                 uint32_t view);
-  ShaderDebugTrace *DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample,
-                               uint32_t primitive);
+  ShaderDebugTrace *DebugPixel(uint32_t eventId, uint32_t x, uint32_t y,
+                               const DebugPixelInputs &inputs);
   ShaderDebugTrace *DebugThread(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
                                 const rdcfixedarray<uint32_t, 3> &threadid);
   rdcarray<ShaderDebugState> ContinueDebug(ShaderDebugger *debugger);
diff --git a/renderdoc/driver/d3d12/d3d12_shaderdebug.cpp b/renderdoc/driver/d3d12/d3d12_shaderdebug.cpp
index b7934bc76..35e1afa94 100644
--- a/renderdoc/driver/d3d12/d3d12_shaderdebug.cpp
+++ b/renderdoc/driver/d3d12/d3d12_shaderdebug.cpp
@@ -1891,13 +1891,16 @@ ShaderDebugTrace *D3D12Replay::DebugVertex(uint32_t eventId, uint32_t vertid, ui
   return ret;
 }
 
-ShaderDebugTrace *D3D12Replay::DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample,
-                                          uint32_t primitive)
+ShaderDebugTrace *D3D12Replay::DebugPixel(uint32_t eventId, uint32_t x, uint32_t y,
+                                          const DebugPixelInputs &inputs)
 {
   using namespace DXBC;
   using namespace DXBCBytecode;
   using namespace DXBCDebug;
 
+  uint32_t sample = inputs.sample;
+  uint32_t primitive = inputs.primitive;
+
   D3D12MarkerRegion debugpixRegion(
       m_pDevice->GetQueue()->GetReal(),
       StringFormat::Fmt("DebugPixel @ %u of (%u,%u) %u / %u", eventId, x, y, sample, primitive));
diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp
index 701ca4a05..adacbc125 100644
--- a/renderdoc/driver/gl/gl_replay.cpp
+++ b/renderdoc/driver/gl/gl_replay.cpp
@@ -3794,8 +3794,8 @@ ShaderDebugTrace *GLReplay::DebugVertex(uint32_t eventId, uint32_t vertid, uint3
   return new ShaderDebugTrace();
 }
 
-ShaderDebugTrace *GLReplay::DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample,
-                                       uint32_t primitive)
+ShaderDebugTrace *GLReplay::DebugPixel(uint32_t eventId, uint32_t x, uint32_t y,
+                                       const DebugPixelInputs &inputs)
 {
   GLNOTIMP("DebugPixel");
   return new ShaderDebugTrace();
diff --git a/renderdoc/driver/gl/gl_replay.h b/renderdoc/driver/gl/gl_replay.h
index 73d5ebe5f..e13dc3118 100644
--- a/renderdoc/driver/gl/gl_replay.h
+++ b/renderdoc/driver/gl/gl_replay.h
@@ -247,8 +247,8 @@ public:
                                            uint32_t y, const Subresource &sub, CompType typeCast);
   ShaderDebugTrace *DebugVertex(uint32_t eventId, uint32_t vertid, uint32_t instid, uint32_t idx,
                                 uint32_t view);
-  ShaderDebugTrace *DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample,
-                               uint32_t primitive);
+  ShaderDebugTrace *DebugPixel(uint32_t eventId, uint32_t x, uint32_t y,
+                               const DebugPixelInputs &inputs);
   ShaderDebugTrace *DebugThread(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
                                 const rdcfixedarray<uint32_t, 3> &threadid);
   rdcarray<ShaderDebugState> ContinueDebug(ShaderDebugger *debugger);
diff --git a/renderdoc/driver/vulkan/vk_replay.h b/renderdoc/driver/vulkan/vk_replay.h
index a2b93bbb1..387a9e3b4 100644
--- a/renderdoc/driver/vulkan/vk_replay.h
+++ b/renderdoc/driver/vulkan/vk_replay.h
@@ -442,8 +442,8 @@ public:
                                            uint32_t y, const Subresource &sub, CompType typeCast);
   ShaderDebugTrace *DebugVertex(uint32_t eventId, uint32_t vertid, uint32_t instid, uint32_t idx,
                                 uint32_t view);
-  ShaderDebugTrace *DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample,
-                               uint32_t primitive);
+  ShaderDebugTrace *DebugPixel(uint32_t eventId, uint32_t x, uint32_t y,
+                               const DebugPixelInputs &inputs);
   ShaderDebugTrace *DebugThread(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
                                 const rdcfixedarray<uint32_t, 3> &threadid);
   rdcarray<ShaderDebugState> ContinueDebug(ShaderDebugger *debugger);
diff --git a/renderdoc/driver/vulkan/vk_shaderdebug.cpp b/renderdoc/driver/vulkan/vk_shaderdebug.cpp
index d50610de1..b76e008eb 100644
--- a/renderdoc/driver/vulkan/vk_shaderdebug.cpp
+++ b/renderdoc/driver/vulkan/vk_shaderdebug.cpp
@@ -4176,7 +4176,7 @@ ShaderDebugTrace *VulkanReplay::DebugVertex(uint32_t eventId, uint32_t vertid, u
 }
 
 ShaderDebugTrace *VulkanReplay::DebugPixel(uint32_t eventId, uint32_t x, uint32_t y,
-                                           uint32_t sample, uint32_t primitive)
+                                           const DebugPixelInputs &inputs)
 {
   if(!GetAPIProperties().shaderDebugging)
   {
@@ -4193,11 +4193,15 @@ ShaderDebugTrace *VulkanReplay::DebugPixel(uint32_t eventId, uint32_t x, uint32_
   VkDevice dev = m_pDriver->GetDev();
   VkResult vkr = VK_SUCCESS;
 
+  uint32_t sample = inputs.sample;
+  uint32_t primitive = inputs.primitive;
+  uint32_t view = inputs.view;
+
   const VulkanRenderState &state = m_pDriver->GetRenderState();
   VulkanCreationInfo &c = m_pDriver->m_CreationInfo;
 
-  rdcstr regionName = StringFormat::Fmt("DebugPixel @ %u of (%u,%u) sample %u primitive %u",
-                                        eventId, x, y, sample, primitive);
+  rdcstr regionName = StringFormat::Fmt("DebugPixel @ %u of (%u,%u) sample %u primitive %u view %u",
+                                        eventId, x, y, sample, primitive, view);
 
   VkMarkerRegion region(regionName);
 
diff --git a/renderdoc/replay/dummy_driver.cpp b/renderdoc/replay/dummy_driver.cpp
index 34c37e66b..9c24c4c03 100644
--- a/renderdoc/replay/dummy_driver.cpp
+++ b/renderdoc/replay/dummy_driver.cpp
@@ -257,8 +257,8 @@ ShaderDebugTrace *DummyDriver::DebugVertex(uint32_t eventId, uint32_t vertid, ui
   return new ShaderDebugTrace;
 }
 
-ShaderDebugTrace *DummyDriver::DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample,
-                                          uint32_t primitive)
+ShaderDebugTrace *DummyDriver::DebugPixel(uint32_t eventId, uint32_t x, uint32_t y,
+                                          const DebugPixelInputs &inputs)
 {
   return new ShaderDebugTrace;
 }
diff --git a/renderdoc/replay/dummy_driver.h b/renderdoc/replay/dummy_driver.h
index 7e22fe813..be59fa480 100644
--- a/renderdoc/replay/dummy_driver.h
+++ b/renderdoc/replay/dummy_driver.h
@@ -101,8 +101,8 @@ public:
                                            uint32_t y, const Subresource &sub, CompType typeCast);
   ShaderDebugTrace *DebugVertex(uint32_t eventId, uint32_t vertid, uint32_t instid, uint32_t idx,
                                 uint32_t view);
-  ShaderDebugTrace *DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample,
-                               uint32_t primitive);
+  ShaderDebugTrace *DebugPixel(uint32_t eventId, uint32_t x, uint32_t y,
+                               const DebugPixelInputs &inputs);
   ShaderDebugTrace *DebugThread(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
                                 const rdcfixedarray<uint32_t, 3> &threadid);
   rdcarray<ShaderDebugState> ContinueDebug(ShaderDebugger *debugger);
diff --git a/renderdoc/replay/renderdoc_serialise.inl b/renderdoc/replay/renderdoc_serialise.inl
index 460a04aa5..75b7d9b3f 100644
--- a/renderdoc/replay/renderdoc_serialise.inl
+++ b/renderdoc/replay/renderdoc_serialise.inl
@@ -991,6 +991,16 @@ void DoSerialise(SerialiserType &ser, ReplayOptions &el)
   SIZE_CHECK(48);
 }
 
+template <typename SerialiserType>
+void DoSerialise(SerialiserType &ser, DebugPixelInputs &el)
+{
+  SERIALISE_MEMBER(sample);
+  SERIALISE_MEMBER(primitive);
+  SERIALISE_MEMBER(view);
+
+  SIZE_CHECK(12);
+}
+
 #pragma region Common pipeline state
 
 template <typename SerialiserType>
@@ -2474,6 +2484,7 @@ INSTANTIATE_SERIALISE_TYPE(CounterResult)
 INSTANTIATE_SERIALISE_TYPE(CounterValue)
 INSTANTIATE_SERIALISE_TYPE(GPUDevice)
 INSTANTIATE_SERIALISE_TYPE(ReplayOptions)
+INSTANTIATE_SERIALISE_TYPE(DebugPixelInputs)
 INSTANTIATE_SERIALISE_TYPE(D3D11Pipe::Layout)
 INSTANTIATE_SERIALISE_TYPE(D3D11Pipe::InputAssembly)
 INSTANTIATE_SERIALISE_TYPE(D3D11Pipe::View)
diff --git a/renderdoc/replay/replay_controller.cpp b/renderdoc/replay/replay_controller.cpp
index 1b81a44f4..742183f40 100644
--- a/renderdoc/replay/replay_controller.cpp
+++ b/renderdoc/replay/replay_controller.cpp
@@ -1619,14 +1619,13 @@ ShaderDebugTrace *ReplayController::DebugVertex(uint32_t vertid, uint32_t instid
   return ret;
 }
 
-ShaderDebugTrace *ReplayController::DebugPixel(uint32_t x, uint32_t y, uint32_t sample,
-                                               uint32_t primitive)
+ShaderDebugTrace *ReplayController::DebugPixel(uint32_t x, uint32_t y, const DebugPixelInputs &inputs)
 {
   CHECK_REPLAY_THREAD();
 
   RENDERDOC_PROFILEFUNCTION();
 
-  ShaderDebugTrace *ret = m_pDevice->DebugPixel(m_EventID, x, y, sample, primitive);
+  ShaderDebugTrace *ret = m_pDevice->DebugPixel(m_EventID, x, y, inputs);
   FatalErrorCheck();
 
   SetFrameEvent(m_EventID, true);
diff --git a/renderdoc/replay/replay_controller.h b/renderdoc/replay/replay_controller.h
index 83a839ce7..a50afe567 100644
--- a/renderdoc/replay/replay_controller.h
+++ b/renderdoc/replay/replay_controller.h
@@ -203,7 +203,7 @@ public:
   rdcarray<PixelModification> PixelHistory(ResourceId target, uint32_t x, uint32_t y,
                                            const Subresource &sub, CompType typeCast);
   ShaderDebugTrace *DebugVertex(uint32_t vertid, uint32_t instid, uint32_t idx, uint32_t view);
-  ShaderDebugTrace *DebugPixel(uint32_t x, uint32_t y, uint32_t sample, uint32_t primitive);
+  ShaderDebugTrace *DebugPixel(uint32_t x, uint32_t y, const DebugPixelInputs &inputs);
   ShaderDebugTrace *DebugThread(const rdcfixedarray<uint32_t, 3> &groupid,
                                 const rdcfixedarray<uint32_t, 3> &threadid);
   rdcarray<ShaderDebugState> ContinueDebug(ShaderDebugger *debugger);
diff --git a/renderdoc/replay/replay_driver.h b/renderdoc/replay/replay_driver.h
index 7a0a27c53..caf85882f 100644
--- a/renderdoc/replay/replay_driver.h
+++ b/renderdoc/replay/replay_driver.h
@@ -217,8 +217,8 @@ public:
                                                    CompType typeCast) = 0;
   virtual ShaderDebugTrace *DebugVertex(uint32_t eventId, uint32_t vertid, uint32_t instid,
                                         uint32_t idx, uint32_t view) = 0;
-  virtual ShaderDebugTrace *DebugPixel(uint32_t eventId, uint32_t x, uint32_t y, uint32_t sample,
-                                       uint32_t primitive) = 0;
+  virtual ShaderDebugTrace *DebugPixel(uint32_t eventId, uint32_t x, uint32_t y,
+                                       const DebugPixelInputs &inputs) = 0;
   virtual ShaderDebugTrace *DebugThread(uint32_t eventId, const rdcfixedarray<uint32_t, 3> &groupid,
                                         const rdcfixedarray<uint32_t, 3> &threadid) = 0;
   virtual rdcarray<ShaderDebugState> ContinueDebug(ShaderDebugger *debugger) = 0;
diff --git a/util/test/rdtest/shared/Buffer_Truncation.py b/util/test/rdtest/shared/Buffer_Truncation.py
index 81bd990c4..ff211a065 100644
--- a/util/test/rdtest/shared/Buffer_Truncation.py
+++ b/util/test/rdtest/shared/Buffer_Truncation.py
@@ -122,8 +122,7 @@ class Buffer_Truncation(rdtest.TestCase):
             # Debug the shader
             trace: rd.ShaderDebugTrace = self.controller.DebugPixel(int(pipe.GetViewport(0).width/2),
                                                                     int(pipe.GetViewport(0).height/2),
-                                                                    rd.ReplayController.NoPreference,
-                                                                    rd.ReplayController.NoPreference)
+                                                                    rd.DebugPixelInputs())
 
             if trace.debugger is None:
                 self.controller.FreeTrace(trace)
diff --git a/util/test/tests/D3D11/D3D11_CBuffer_Zoo.py b/util/test/tests/D3D11/D3D11_CBuffer_Zoo.py
index 06e2acd92..f76463fa8 100644
--- a/util/test/tests/D3D11/D3D11_CBuffer_Zoo.py
+++ b/util/test/tests/D3D11/D3D11_CBuffer_Zoo.py
@@ -31,8 +31,7 @@ class D3D11_CBuffer_Zoo(rdtest.TestCase):
                 rd.ShaderStage.Pixel).debugInfo.debuggable:
             trace: rd.ShaderDebugTrace = self.controller.DebugPixel(int(pipe.GetViewport(0).width / 2.0),
                                                                     int(pipe.GetViewport(0).height / 2.0),
-                                                                    rd.ReplayController.NoPreference,
-                                                                    rd.ReplayController.NoPreference)
+                                                                    rd.DebugPixelInputs())
 
             debugVars = dict()
 
diff --git a/util/test/tests/D3D11/D3D11_PrimitiveID.py b/util/test/tests/D3D11/D3D11_PrimitiveID.py
index 039612b55..29bf9133e 100644
--- a/util/test/tests/D3D11/D3D11_PrimitiveID.py
+++ b/util/test/tests/D3D11/D3D11_PrimitiveID.py
@@ -10,7 +10,9 @@ class D3D11_PrimitiveID(rdtest.TestCase):
         self.controller.SetFrameEvent(action.eventId, True)
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
-        trace: rd.ShaderDebugTrace = self.controller.DebugPixel(x, y, rd.ReplayController.NoPreference, prim)
+        inputs = rd.DebugPixelInputs()
+        inputs.primitive = prim
+        trace: rd.ShaderDebugTrace = self.controller.DebugPixel(x, y, inputs)
 
         sourceVars: List[rd.SourceVariableMapping] = list(trace.sourceVars)
         cycles, variables = self.process_trace(trace)
diff --git a/util/test/tests/D3D11/D3D11_Shader_Debug_Zoo.py b/util/test/tests/D3D11/D3D11_Shader_Debug_Zoo.py
index bc03f16c2..52e5318d3 100644
--- a/util/test/tests/D3D11/D3D11_Shader_Debug_Zoo.py
+++ b/util/test/tests/D3D11/D3D11_Shader_Debug_Zoo.py
@@ -22,8 +22,7 @@ class D3D11_Shader_Debug_Zoo(rdtest.TestCase):
         rdtest.log.begin_section("General tests")
         for test in range(action.numInstances):
             # Debug the shader
-            trace: rd.ShaderDebugTrace = self.controller.DebugPixel(4 * test, 0, rd.ReplayController.NoPreference,
-                                                                    rd.ReplayController.NoPreference)
+            trace: rd.ShaderDebugTrace = self.controller.DebugPixel(4 * test, 0, rd.DebugPixelInputs())
 
             cycles, variables = self.process_trace(trace)
 
@@ -52,8 +51,7 @@ class D3D11_Shader_Debug_Zoo(rdtest.TestCase):
         pipe: rd.PipeState = self.controller.GetPipelineState()
 
         # Debug the shader
-        trace: rd.ShaderDebugTrace = self.controller.DebugPixel(0, 4, rd.ReplayController.NoPreference,
-                                                                rd.ReplayController.NoPreference)
+        trace: rd.ShaderDebugTrace = self.controller.DebugPixel(0, 4, rd.DebugPixelInputs())
 
         cycles, variables = self.process_trace(trace)
 
@@ -79,8 +77,9 @@ class D3D11_Shader_Debug_Zoo(rdtest.TestCase):
         pipe: rd.PipeState = self.controller.GetPipelineState()
         for test in range(4):
             # Debug the shader
-            trace: rd.ShaderDebugTrace = self.controller.DebugPixel(4, 4, test,
-                                                                    rd.ReplayController.NoPreference)
+            inputs = rd.DebugPixelInputs()
+            inputs.sample = test
+            trace: rd.ShaderDebugTrace = self.controller.DebugPixel(4, 4, inputs)
 
             # Validate that the correct sample index was debugged
             sampRegister = self.find_input_source_var(trace, rd.ShaderBuiltin.MSAASampleIndex)
diff --git a/util/test/tests/D3D11/D3D11_Shader_Linkage_Zoo.py b/util/test/tests/D3D11/D3D11_Shader_Linkage_Zoo.py
index 215a92403..2312612cb 100644
--- a/util/test/tests/D3D11/D3D11_Shader_Linkage_Zoo.py
+++ b/util/test/tests/D3D11/D3D11_Shader_Linkage_Zoo.py
@@ -19,8 +19,7 @@ class D3D11_Shader_Linkage_Zoo(rdtest.TestCase):
             pipe: rd.PipeState = self.controller.GetPipelineState()
 
             # Debug the shader
-            trace: rd.ShaderDebugTrace = self.controller.DebugPixel(200, 150, rd.ReplayController.NoPreference,
-                                                                    rd.ReplayController.NoPreference)
+            trace: rd.ShaderDebugTrace = self.controller.DebugPixel(200, 150, rd.DebugPixelInputs())
             if trace.debugger is None:
                 failed = True
                 rdtest.log.error("Test {} could not be debugged.".format(event_name))
diff --git a/util/test/tests/D3D12/D3D12_CBuffer_Zoo.py b/util/test/tests/D3D12/D3D12_CBuffer_Zoo.py
index 2281a465e..73540356b 100644
--- a/util/test/tests/D3D12/D3D12_CBuffer_Zoo.py
+++ b/util/test/tests/D3D12/D3D12_CBuffer_Zoo.py
@@ -103,8 +103,7 @@ class D3D12_CBuffer_Zoo(rdtest.TestCase):
                 rd.ShaderStage.Pixel).debugInfo.debuggable:
             trace: rd.ShaderDebugTrace = self.controller.DebugPixel(int(pipe.GetViewport(0).width / 2.0),
                                                                     int(pipe.GetViewport(0).height / 2.0),
-                                                                    rd.ReplayController.NoPreference,
-                                                                    rd.ReplayController.NoPreference)
+                                                                    rd.DebugPixelInputs())
 
             debugVars = dict()
 
diff --git a/util/test/tests/D3D12/D3D12_PrimitiveID.py b/util/test/tests/D3D12/D3D12_PrimitiveID.py
index 7a5db4ae6..d9db82dac 100644
--- a/util/test/tests/D3D12/D3D12_PrimitiveID.py
+++ b/util/test/tests/D3D12/D3D12_PrimitiveID.py
@@ -14,7 +14,9 @@ class D3D12_PrimitiveID(rdtest.TestCase):
             rdtest.log.print("Skipping undebuggable shader at {}.".format(action.eventId))
             return
 
-        trace: rd.ShaderDebugTrace = self.controller.DebugPixel(x, y, rd.ReplayController.NoPreference, prim)
+        inputs = rd.DebugPixleInputs()
+        inputs.primitive = prim
+        trace: rd.ShaderDebugTrace = self.controller.DebugPixel(x, y, inputs)
 
         cycles, variables = self.process_trace(trace)
 
diff --git a/util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py b/util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py
index dc63ac99b..4027c7625 100644
--- a/util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py
+++ b/util/test/tests/D3D12/D3D12_Resource_Mapping_Zoo.py
@@ -14,8 +14,7 @@ class D3D12_Resource_Mapping_Zoo(rdtest.TestCase):
             return
 
         # Debug the shader
-        trace: rd.ShaderDebugTrace = self.controller.DebugPixel(x, y, rd.ReplayController.NoPreference,
-                                                                rd.ReplayController.NoPreference)
+        trace: rd.ShaderDebugTrace = self.controller.DebugPixel(x, y, rd.DebugPixelInputs())
 
         cycles, variables = self.process_trace(trace)
 
diff --git a/util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py b/util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py
index b4011ab00..670613b9e 100644
--- a/util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py
+++ b/util/test/tests/D3D12/D3D12_Shader_Debug_Zoo.py
@@ -33,8 +33,7 @@ class D3D12_Shader_Debug_Zoo(rdtest.TestCase):
             # Loop over every test
             for test in range(action.numInstances):
                 # Debug the shader
-                trace: rd.ShaderDebugTrace = self.controller.DebugPixel(4 * test, 0, rd.ReplayController.NoPreference,
-                                                                        rd.ReplayController.NoPreference)
+                trace: rd.ShaderDebugTrace = self.controller.DebugPixel(4 * test, 0, rd.DebugPixelInputs())
 
                 cycles, variables = self.process_trace(trace)
 
@@ -65,8 +64,9 @@ class D3D12_Shader_Debug_Zoo(rdtest.TestCase):
         pipe: rd.PipeState = self.controller.GetPipelineState()
         for test in range(4):
             # Debug the shader
-            trace: rd.ShaderDebugTrace = self.controller.DebugPixel(4, 4, test,
-                                                                    rd.ReplayController.NoPreference)
+            inputs = rd.DebugPixelInputs()
+            inputs.sample = test
+            trace: rd.ShaderDebugTrace = self.controller.DebugPixel(4, 4, inputs)
 
             # Validate that the correct sample index was debugged
             sampRegister = self.find_input_source_var(trace, rd.ShaderBuiltin.MSAASampleIndex)
@@ -113,7 +113,9 @@ class D3D12_Shader_Debug_Zoo(rdtest.TestCase):
         rdtest.log.success("VertexSample VS was debugged correctly")
 
         # Debug the pixel shader
-        trace: rd.ShaderDebugTrace = self.controller.DebugPixel(51, 51, 0, rd.ReplayController.NoPreference)
+        inputs = rd.DebugPixelInputs()
+        inputs.sample = 0
+        trace: rd.ShaderDebugTrace = self.controller.DebugPixel(51, 51, inputs)
 
         cycles, variables = self.process_trace(trace)
 
@@ -157,7 +159,9 @@ class D3D12_Shader_Debug_Zoo(rdtest.TestCase):
         rdtest.log.success("Banned signature VS was debugged correctly")
 
         # Debug the pixel shader
-        trace: rd.ShaderDebugTrace = self.controller.DebugPixel(64, 64, 0, rd.ReplayController.NoPreference)
+        inputs = rd.DebugPixelInputs()
+        inputs.sample = 0
+        trace: rd.ShaderDebugTrace = self.controller.DebugPixel(64, 64, inputs)
 
         cycles, variables = self.process_trace(trace)
 
diff --git a/util/test/tests/D3D12/D3D12_Shader_Linkage_Zoo.py b/util/test/tests/D3D12/D3D12_Shader_Linkage_Zoo.py
index 76d14e0c2..3251c6609 100644
--- a/util/test/tests/D3D12/D3D12_Shader_Linkage_Zoo.py
+++ b/util/test/tests/D3D12/D3D12_Shader_Linkage_Zoo.py
@@ -27,8 +27,7 @@ class D3D12_Shader_Linkage_Zoo(rdtest.TestCase):
                 continue
 
             # Debug the shader
-            trace: rd.ShaderDebugTrace = self.controller.DebugPixel(200, 150, rd.ReplayController.NoPreference,
-                                                                    rd.ReplayController.NoPreference)
+            trace: rd.ShaderDebugTrace = self.controller.DebugPixel(200, 150, rd.DebugPixelInputs())
             if trace.debugger is None:
                 failed = True
                 rdtest.log.error("Test {} could not be debugged.".format(event_name))
diff --git a/util/test/tests/D3D12/D3D12_Vertex_UAV.py b/util/test/tests/D3D12/D3D12_Vertex_UAV.py
index bbc52dbb2..f108c4d71 100644
--- a/util/test/tests/D3D12/D3D12_Vertex_UAV.py
+++ b/util/test/tests/D3D12/D3D12_Vertex_UAV.py
@@ -48,8 +48,7 @@ class D3D12_Vertex_UAV(rdtest.TestCase):
                     continue
 
                 # Debug the shader
-                trace = self.controller.DebugPixel(50, 50, rd.ReplayController.NoPreference,
-                                                   rd.ReplayController.NoPreference)
+                trace = self.controller.DebugPixel(50, 50, rd.DebugPixelInputs())
                 if trace.debugger is None:
                     raise rdtest.TestFailureException("Pixel shader at {} could not be debugged.".format(name))
                     self.controller.FreeTrace(trace)
diff --git a/util/test/tests/Iter_Test.py b/util/test/tests/Iter_Test.py
index 11faa9a5b..2d4c12e64 100644
--- a/util/test/tests/Iter_Test.py
+++ b/util/test/tests/Iter_Test.py
@@ -243,7 +243,10 @@ class Iter_Test(rdtest.TestCase):
 
             pipe: rd.PipeState = self.controller.GetPipelineState()
 
-            trace = self.controller.DebugPixel(x, y, 0, lastmod.primitiveID)
+            inputs = rd.DebugPixelInputs()
+            inputs.sample = 0
+            inputs.primitive = lastmod.primitiveID;
+            trace = self.controller.DebugPixel(x, y, inputs)
 
             if trace.debugger is None:
                 self.controller.FreeTrace(trace)
diff --git a/util/test/tests/Vulkan/VK_Graphics_Pipeline.py b/util/test/tests/Vulkan/VK_Graphics_Pipeline.py
index 831626efd..e1971f3a8 100644
--- a/util/test/tests/Vulkan/VK_Graphics_Pipeline.py
+++ b/util/test/tests/Vulkan/VK_Graphics_Pipeline.py
@@ -138,7 +138,10 @@ class VK_Graphics_Pipeline(rdtest.TestCase):
             raise rdtest.TestFailureException(
                 "History for drawcall output is wrong: {}".format(history[1].shaderOut.col.floatValue))
 
-        trace = self.controller.DebugPixel(200, 150, 0, 0)
+        inputs = rd.DebugPixelInputs()
+        inputs.sample = 0
+        inputs.primitive = 0
+        trace = self.controller.DebugPixel(200, 150, inputs)
 
         if trace.debugger is None:
             raise rdtest.TestFailureException("No pixel debug result")
diff --git a/util/test/tests/Vulkan/VK_KHR_Buffer_Address.py b/util/test/tests/Vulkan/VK_KHR_Buffer_Address.py
index b2421f911..3312d0689 100644
--- a/util/test/tests/Vulkan/VK_KHR_Buffer_Address.py
+++ b/util/test/tests/Vulkan/VK_KHR_Buffer_Address.py
@@ -23,8 +23,7 @@ class VK_KHR_Buffer_Address(rdtest.TestCase):
                 raise rdtest.TestFailureException("Test {} shader can not be debugged".format(test_name))
 
             # Debug the pixel shader
-            trace: rd.ShaderDebugTrace = self.controller.DebugPixel(x, y, rd.ReplayController.NoPreference,
-                                                                        rd.ReplayController.NoPreference)
+            trace: rd.ShaderDebugTrace = self.controller.DebugPixel(x, y, rd.DebugPixelInputs())
             if trace.debugger is None:
                 self.controller.FreeTrace(trace)
                 raise rdtest.TestFailureException("Test {} did not debug at all".format(test_name))
diff --git a/util/test/tests/Vulkan/VK_Multi_Entry.py b/util/test/tests/Vulkan/VK_Multi_Entry.py
index 8f5384555..33e68d92b 100644
--- a/util/test/tests/Vulkan/VK_Multi_Entry.py
+++ b/util/test/tests/Vulkan/VK_Multi_Entry.py
@@ -97,8 +97,11 @@ class VK_Multi_Entry(rdtest.TestCase):
             raise rdtest.TestFailureException(
                 "History for drawcall output is wrong: {}".format(history[1].shaderOut.col.floatValue))
 
-        trace = self.controller.DebugPixel(200, 150, 0, 0)
-
+        inputs = rd.DebugPixelInputs()
+        inputs.sample = 0
+        inputs.primitive = 0
+        trace = self.controller.DebugPixel(200, 150, inputs)
+    
         refl: rd.ShaderReflection = pipe.GetShaderReflection(rd.ShaderStage.Pixel)
 
         self.check(len(refl.readOnlyResources) == 1)
diff --git a/util/test/tests/Vulkan/VK_Shader_Debug_Zoo.py b/util/test/tests/Vulkan/VK_Shader_Debug_Zoo.py
index 8d53c1d14..d3188fbba 100644
--- a/util/test/tests/Vulkan/VK_Shader_Debug_Zoo.py
+++ b/util/test/tests/Vulkan/VK_Shader_Debug_Zoo.py
@@ -30,8 +30,7 @@ class VK_Shader_Debug_Zoo(rdtest.TestCase):
                     y = 4 * child + 1
 
                     # Debug the shader
-                    trace: rd.ShaderDebugTrace = self.controller.DebugPixel(x, y, rd.ReplayController.NoPreference,
-                                                                            rd.ReplayController.NoPreference)
+                    trace: rd.ShaderDebugTrace = self.controller.DebugPixel(x, y, rd.DebugPixelInputs())
 
                     if trace.debugger is None:
                         failed = True