From 886d6f608bfcf1add60ab46820e701a52ddcdd4a Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 10 May 2017 10:25:25 +0100
Subject: [PATCH] Fix case that samplers are now "IsSRV" (renamed to IsReadOnly
 elsewhere)

---
 qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp | 2 +-
 renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
index 1257f710c..97aca16de 100644
--- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
+++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
@@ -879,7 +879,7 @@ void D3D11PipelineStateViewer::setShaderState(const D3D11Pipe::Shader &stage, QL
     {
       for(const ShaderResource &bind : shaderDetails->ReadOnlyResources)
       {
-        if(bind.IsReadOnly && bind.bindPoint == i)
+        if(!bind.IsSampler && bind.IsReadOnly && bind.bindPoint == i)
         {
           shaderInput = &bind;
           break;
diff --git a/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs b/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs
index d31281bea..76e30b8fe 100644
--- a/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs
+++ b/renderdocui/Windows/PipelineState/D3D11PipelineStateViewer.cs
@@ -339,7 +339,7 @@ namespace renderdocui.Windows.PipelineState
                     {
                         foreach (var bind in shaderDetails.ReadOnlyResources)
                         {
-                            if (bind.IsSRV && bind.bindPoint == i)
+                            if (!bind.IsSampler && bind.IsSRV && bind.bindPoint == i)
                             {
                                 shaderInput = bind;
                                 break;
@@ -2072,7 +2072,7 @@ namespace renderdocui.Windows.PipelineState
                     ShaderResource[] resources = uav ? deets.ReadWriteResources : deets.ReadOnlyResources;
                     foreach (var r in resources)
                     {
-                        if (r.IsTexture)
+                        if (r.IsTexture || r.IsSampler)
                             continue;
 
                         if (r.bindPoint == bind)