| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 Google Inc. | 2 * Copyright 2016 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef GrGLSLTextureSampler_DEFINED | 8 #ifndef GrGLSLSampler_DEFINED |
| 9 #define GrGLSLTextureSampler_DEFINED | 9 #define GrGLSLSampler_DEFINED |
| 10 | 10 |
| 11 #include "GrShaderVar.h" | 11 #include "GrTypes.h" |
| 12 #include "GrTextureAccess.h" | 12 #include "SkTArray.h" |
| 13 #include "glsl/GrGLSLProgramDataManager.h" | 13 #include "glsl/GrGLSLProgramDataManager.h" |
| 14 | 14 |
| 15 class GrGLSLTextureSampler { | 15 class GrGLSLSampler { |
| 16 public: | 16 public: |
| 17 typedef GrGLSLProgramDataManager::UniformHandle UniformHandle; | 17 typedef GrGLSLProgramDataManager::UniformHandle UniformHandle; |
| 18 typedef SkTArray<GrGLSLTextureSampler> TextureSamplerArray; | 18 typedef SkTArray<GrGLSLSampler> SamplerArray; |
| 19 | 19 |
| 20 GrGLSLTextureSampler(UniformHandle uniform, const GrTextureAccess& access) | 20 GrGLSLSampler(UniformHandle uniform, GrPixelConfig config) |
| 21 : fSamplerUniform(uniform) | 21 : fSamplerUniform(uniform) |
| 22 , fConfig(access.getTexture()->config()) { | 22 , fConfig(config) { |
| 23 SkASSERT(kUnknown_GrPixelConfig != fConfig); | 23 SkASSERT(kUnknown_GrPixelConfig != fConfig); |
| 24 } | 24 } |
| 25 | 25 |
| 26 GrPixelConfig config() const { return fConfig; } | 26 GrPixelConfig config() const { return fConfig; } |
| 27 | 27 |
| 28 private: | 28 private: |
| 29 UniformHandle fSamplerUniform; | 29 UniformHandle fSamplerUniform; |
| 30 GrPixelConfig fConfig; | 30 GrPixelConfig fConfig; |
| 31 | 31 |
| 32 friend class GrGLSLShaderBuilder; | 32 friend class GrGLSLShaderBuilder; |
| 33 }; | 33 }; |
| 34 | 34 |
| 35 #endif | 35 #endif |
| OLD | NEW |