Revert of Refactor how we store and use samplers in Ganesh

gyp/gpu.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # Include this gypi to include all 'gpu' files
 # The parent gyp/gypi file must define
 #       'skia_src_path'     e.g. skia/trunk/src
 #       'skia_include_path' e.g. skia/trunk/include
 #
 # The skia build defines these in common_variables.gypi
@@ skipping 326 matching lines @@
       '<(skia_src_path)/gpu/gl/GrGLPathRendering.cpp',
       '<(skia_src_path)/gpu/gl/GrGLPathRendering.h',
       '<(skia_src_path)/gpu/gl/GrGLProgram.cpp',
       '<(skia_src_path)/gpu/gl/GrGLProgram.h',
       '<(skia_src_path)/gpu/gl/GrGLProgramDesc.cpp',
       '<(skia_src_path)/gpu/gl/GrGLProgramDesc.h',
       '<(skia_src_path)/gpu/gl/GrGLProgramDataManager.cpp',
       '<(skia_src_path)/gpu/gl/GrGLProgramDataManager.h',
       '<(skia_src_path)/gpu/gl/GrGLRenderTarget.cpp',
       '<(skia_src_path)/gpu/gl/GrGLRenderTarget.h',
-      '<(skia_src_path)/gpu/gl/GrGLSampler.h',
       '<(skia_src_path)/gpu/gl/GrGLStencilAttachment.cpp',
       '<(skia_src_path)/gpu/gl/GrGLStencilAttachment.h',
       '<(skia_src_path)/gpu/gl/GrGLTestInterface.cpp',
       '<(skia_src_path)/gpu/gl/GrGLTestInterface.h',
       '<(skia_src_path)/gpu/gl/GrGLTexture.cpp',
       '<(skia_src_path)/gpu/gl/GrGLTexture.h',
       '<(skia_src_path)/gpu/gl/GrGLTextureRenderTarget.cpp',
       '<(skia_src_path)/gpu/gl/GrGLTextureRenderTarget.h',
       '<(skia_src_path)/gpu/gl/GrGLUtil.cpp',
       '<(skia_src_path)/gpu/gl/GrGLUtil.h',
@@ skipping 77 matching lines @@
       '<(skia_src_path)/gpu/vk/GrVkCaps.cpp',
       '<(skia_src_path)/gpu/vk/GrVkCaps.h',
       '<(skia_src_path)/gpu/vk/GrVkCommandBuffer.cpp',
       '<(skia_src_path)/gpu/vk/GrVkCommandBuffer.h',
       '<(skia_src_path)/gpu/vk/GrVkDescriptorPool.cpp',
       '<(skia_src_path)/gpu/vk/GrVkDescriptorPool.h',
       '<(skia_src_path)/gpu/vk/GrVkExtensions.cpp',
       '<(skia_src_path)/gpu/vk/GrVkExtensions.h',
       '<(skia_src_path)/gpu/vk/GrVkFramebuffer.cpp',
       '<(skia_src_path)/gpu/vk/GrVkFramebuffer.h',
-      '<(skia_src_path)/gpu/vk/GrVkGLSLSampler.h',
       '<(skia_src_path)/gpu/vk/GrVkGpu.cpp',
       '<(skia_src_path)/gpu/vk/GrVkGpu.h',
       '<(skia_src_path)/gpu/vk/GrVkImage.cpp',
       '<(skia_src_path)/gpu/vk/GrVkImage.h',
       '<(skia_src_path)/gpu/vk/GrVkImageView.cpp',
       '<(skia_src_path)/gpu/vk/GrVkImageView.h',
       '<(skia_src_path)/gpu/vk/GrVkIndexBuffer.cpp',
       '<(skia_src_path)/gpu/vk/GrVkIndexBuffer.h',
       '<(skia_src_path)/gpu/vk/GrVkInterface.cpp',
       '<(skia_src_path)/gpu/vk/GrVkMemory.cpp',
@@ skipping 43 matching lines @@
       '<(skia_src_path)/gpu/gl/win/GrGLCreateNativeInterface_win.cpp',
       '<(skia_src_path)/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp',
       '<(skia_src_path)/gpu/gl/egl/GrGLCreateNativeInterface_egl.cpp',
       '<(skia_src_path)/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp',
       '<(skia_src_path)/gpu/gl/android/GrGLCreateNativeInterface_android.cpp',
     ],
     'skgpu_null_gl_sources': [
     ],
   },
 }