From 662ea4baba570d2f21a7b33d268204e9bdfa7fb9 Mon Sep 17 00:00:00 2001
From: Brian Salomon <bsalomon@google.com>
Date: Thu, 12 Jul 2018 14:53:49 -0400
Subject: Remove texel buffer support.

Change-Id: Ia6f21afe714208979a5bc384e436b28ea2b9a297
Reviewed-on: https://skia-review.googlesource.com/141051
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
---
 src/sksl/SkSLIRGenerator.cpp        |  1 -
 src/sksl/SkSLSPIRVCodeGenerator.cpp | 17 -----------------
 src/sksl/SkSLSPIRVCodeGenerator.h   |  1 -
 src/sksl/SkSLUtil.h                 |  5 -----
 src/sksl/sksl.inc                   |  3 ---
 5 files changed, 27 deletions(-)

(limited to 'src/sksl')

diff --git a/src/sksl/SkSLIRGenerator.cpp b/src/sksl/SkSLIRGenerator.cpp
index 5a54b07333..ba1476e275 100644
--- a/src/sksl/SkSLIRGenerator.cpp
+++ b/src/sksl/SkSLIRGenerator.cpp
@@ -131,7 +131,6 @@ static void fill_caps(const SKSL_CAPS_CLASS& caps,
     CAP(flatInterpolationSupport);
     CAP(noperspectiveInterpolationSupport);
     CAP(externalTextureSupport);
-    CAP(texelFetchSupport);
     CAP(imageLoadStoreSupport);
     CAP(mustEnableAdvBlendEqs);
     CAP(mustEnableSpecificAdvBlendEqs);
diff --git a/src/sksl/SkSLSPIRVCodeGenerator.cpp b/src/sksl/SkSLSPIRVCodeGenerator.cpp
index fcee9aeee0..c8e1255352 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.cpp
+++ b/src/sksl/SkSLSPIRVCodeGenerator.cpp
@@ -102,7 +102,6 @@ void SPIRVCodeGenerator::setupIntrinsics() {
     fIntrinsicMap[String("dFdy")]        = std::make_tuple(kSPIRV_IntrinsicKind, SpvOpDPdy,
                                                            SpvOpUndef, SpvOpUndef, SpvOpUndef);
     fIntrinsicMap[String("texture")]     = SPECIAL(Texture);
-    fIntrinsicMap[String("texelFetch")]  = SPECIAL(TexelFetch);
     fIntrinsicMap[String("subpassLoad")] = SPECIAL(SubpassLoad);
 
     fIntrinsicMap[String("any")]              = std::make_tuple(kSPIRV_IntrinsicKind, SpvOpUndef,
@@ -833,22 +832,6 @@ SpvId SPIRVCodeGenerator::writeSpecialIntrinsic(const FunctionCall& c, SpecialIn
             }
             break;
         }
-        case kTexelFetch_SpecialIntrinsic: {
-            SkASSERT(c.fArguments.size() == 2);
-            SpvId image = this->nextId();
-            this->writeInstruction(SpvOpImage,
-                                   this->getImageType(c.fArguments[0]->fType),
-                                   image,
-                                   this->writeExpression(*c.fArguments[0], out),
-                                   out);
-            this->writeInstruction(SpvOpImageFetch,
-                                   this->getType(c.fType),
-                                   result,
-                                   image,
-                                   this->writeExpression(*c.fArguments[1], out),
-                                   out);
-            break;
-        }
         case kTexture_SpecialIntrinsic: {
             SpvOp_ op = SpvOpImageSampleImplicitLod;
             switch (c.fArguments[0]->fType.dimensions()) {
diff --git a/src/sksl/SkSLSPIRVCodeGenerator.h b/src/sksl/SkSLSPIRVCodeGenerator.h
index e7bec1e558..fee54ad65c 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.h
+++ b/src/sksl/SkSLSPIRVCodeGenerator.h
@@ -96,7 +96,6 @@ private:
         kMix_SpecialIntrinsic,
         kMod_SpecialIntrinsic,
         kSubpassLoad_SpecialIntrinsic,
-        kTexelFetch_SpecialIntrinsic,
         kTexture_SpecialIntrinsic,
     };
 
diff --git a/src/sksl/SkSLUtil.h b/src/sksl/SkSLUtil.h
index efff74c37a..60979bbd30 100644
--- a/src/sksl/SkSLUtil.h
+++ b/src/sksl/SkSLUtil.h
@@ -105,10 +105,6 @@ public:
         return true;
     }
 
-    bool texelFetchSupport() const {
-        return true;
-    }
-
     bool imageLoadStoreSupport() const {
         return true;
     }
@@ -306,7 +302,6 @@ public:
         result->fExternalTextureSupport = true;
         result->fFBFetchSupport = false;
         result->fDropsTileOnZeroDivide = true;
-        result->fTexelFetchSupport = true;
         result->fCanUseAnyFunctionInShader = false;
         return result;
     }
diff --git a/src/sksl/sksl.inc b/src/sksl/sksl.inc
index 0d38e73af6..3d7b53a94d 100644
--- a/src/sksl/sksl.inc
+++ b/src/sksl/sksl.inc
@@ -378,13 +378,10 @@ $gfloat4 textureOffset($gsampler2DArray sampler, float3 P, int2 offset, float bi
 float textureOffset(sampler1DArrayShadow sampler, float3 P, int offset);
 float textureOffset(sampler1DArrayShadow sampler, float3 P, int offset, float bias);
 float textureOffset(sampler2DArrayShadow sampler, float4 P, int2 offset);
-*/
 float4 texelFetch(samplerBuffer sampler, int P);
-
 $gfloat4 texelFetch($gsampler1D sampler, int P, int lod);
 $gfloat4 texelFetch($gsampler2D sampler, int2 P, int lod);
 $gfloat4 texelFetch($gsampler2DRect sampler, int2 P);
-/*
 $gfloat4 texelFetch($gsampler3D sampler, int3 P, int lod);
 $gfloat4 texelFetch($gsampler1DArray sampler, int2 P, int lod);
 $gfloat4 texelFetch($gsampler2DArray sampler, int3 P, int lod);
-- 
cgit v1.2.3