commit 3a59665099da62835f54192ae9a4f2480e91c8ff
author Chris Dalton <csmartdalton@google.com> Wed Jul 05 17:23:29 2017 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jul 05 17:23:35 2017 +0000
tree f73f10c88cd99988a5c0a9635eecc94d78b308ca
parent 8b9566a257312f1cbd447f0cfdbb2cfb349f3c26

Revert "Indicate texel buffer support in Vulkan"

This reverts commit 2dd222639dba16fab4e81dbf3e7916fc1eb2cd29.

Reason for revert: Programs test assertion failures

Original change's description:
> Indicate texel buffer support in Vulkan
> 
> Bug: skia:
> Change-Id: I116dd2b15320e3a61afba82b003b13a14ce6122f
> Reviewed-on: https://skia-review.googlesource.com/21402
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>

TBR=egdaniel@google.com,csmartdalton@google.com

Change-Id: I41ee31624636c497125ff38bcb7ce0382d9f386b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/21582
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/vk/GrVkBuffer.cpp

diff --git a/src/gpu/vk/GrVkBuffer.cpp b/src/gpu/vk/GrVkBuffer.cpp
index 9926ec4..d0332b9 100644
--- a/src/gpu/vk/GrVkBuffer.cpp
+++ b/src/gpu/vk/GrVkBuffer.cpp
@@ -227,6 +227,6 @@
 
 void GrVkBuffer::validate() const {
     SkASSERT(!fResource || kVertex_Type == fDesc.fType || kIndex_Type == fDesc.fType
-             || kTexel_Type == fDesc.fType || kCopyRead_Type == fDesc.fType
-             || kCopyWrite_Type == fDesc.fType || kUniform_Type == fDesc.fType);
+             || kCopyRead_Type == fDesc.fType || kCopyWrite_Type == fDesc.fType
+             || kUniform_Type == fDesc.fType);
 }

src/gpu/vk/GrVkCaps.cpp

diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp
index db92617..e8a3978 100644
--- a/src/gpu/vk/GrVkCaps.cpp
+++ b/src/gpu/vk/GrVkCaps.cpp
@@ -248,8 +248,6 @@
     }
 
     shaderCaps->fIntegerSupport = true;
-    shaderCaps->fTexelBufferSupport = true;
-    shaderCaps->fTexelFetchSupport = true;
     shaderCaps->fVertexIDSupport = true;
 
     // Assume the minimum precisions mandated by the SPIR-V spec.