diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-11-11 16:08:03 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-11 21:58:52 +0000 |
| commit | bf7b620b1e44985b164a8bd68031a7613fe0bb9b (patch) | |
| tree | 39c26fc481302f134d6b9079491dcbb59eecb6bf /src/gpu/vk/GrVkUniformHandler.cpp | |
| parent | 06dd5c77a6ca6c484c683f1006a7bb6742f8917e (diff) | |
Revert "Revert "Add integer texture support.""
This reverts commit 9c7edb8311409a141b0dc1d5e480c68c629f1997.
Fixes ASAN errors
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4736
Change-Id: I1b1dae754d357b01da7169c8e7c59d7d8d8a10f6
Reviewed-on: https://skia-review.googlesource.com/4736
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/vk/GrVkUniformHandler.cpp')
| -rw-r--r-- | src/gpu/vk/GrVkUniformHandler.cpp | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/src/gpu/vk/GrVkUniformHandler.cpp b/src/gpu/vk/GrVkUniformHandler.cpp index 4a6e977a8c..7c11b9dc46 100644 --- a/src/gpu/vk/GrVkUniformHandler.cpp +++ b/src/gpu/vk/GrVkUniformHandler.cpp @@ -25,10 +25,11 @@ uint32_t grsltype_to_alignment_mask(GrSLType type) { 0x7, // kMat22f_GrSLType 0xF, // kMat33f_GrSLType 0xF, // kMat44f_GrSLType - 0x0, // Sampler2D_GrSLType, should never return this - 0x0, // SamplerExternal_GrSLType, should never return this - 0x0, // Sampler2DRect_GrSLType, should never return this - 0x0, // SamplerBuffer_GrSLType, should never return this + 0x0, // kTexture2DSampler_GrSLType, should never return this + 0x0, // kTexture2DISampler_GrSLType, should never return this + 0x0, // kTextureExternalSampler_GrSLType, should never return this + 0x0, // kTexture2DSamplerRect_GrSLType, should never return this + 0x0, // ktextureBufferSampler_GrSLType, should never return this 0x0, // kBool_GrSLType 0x7, // kInt_GrSLType 0x7, // kUint_GrSLType @@ -44,14 +45,15 @@ uint32_t grsltype_to_alignment_mask(GrSLType type) { GR_STATIC_ASSERT(6 == kMat33f_GrSLType); GR_STATIC_ASSERT(7 == kMat44f_GrSLType); GR_STATIC_ASSERT(8 == kTexture2DSampler_GrSLType); - GR_STATIC_ASSERT(9 == kTextureExternalSampler_GrSLType); - GR_STATIC_ASSERT(10 == kTexture2DRectSampler_GrSLType); - GR_STATIC_ASSERT(11 == kTextureBufferSampler_GrSLType); - GR_STATIC_ASSERT(12 == kBool_GrSLType); - GR_STATIC_ASSERT(13 == kInt_GrSLType); - GR_STATIC_ASSERT(14 == kUint_GrSLType); - GR_STATIC_ASSERT(15 == kTexture2D_GrSLType); - GR_STATIC_ASSERT(16 == kSampler_GrSLType); + GR_STATIC_ASSERT(9 == kTexture2DISampler_GrSLType); + GR_STATIC_ASSERT(10 == kTextureExternalSampler_GrSLType); + GR_STATIC_ASSERT(11 == kTexture2DRectSampler_GrSLType); + GR_STATIC_ASSERT(12 == kTextureBufferSampler_GrSLType); + GR_STATIC_ASSERT(13 == kBool_GrSLType); + GR_STATIC_ASSERT(14 == kInt_GrSLType); + GR_STATIC_ASSERT(15 == kUint_GrSLType); + GR_STATIC_ASSERT(16 == kTexture2D_GrSLType); + GR_STATIC_ASSERT(17 == kSampler_GrSLType); GR_STATIC_ASSERT(SK_ARRAY_COUNT(kAlignmentMask) == kGrSLTypeCount); return kAlignmentMask[type]; } @@ -71,6 +73,7 @@ static inline uint32_t grsltype_to_vk_size(GrSLType type) { 12 * sizeof(float), // kMat33f_GrSLType 16 * sizeof(float), // kMat44f_GrSLType 0, // kTexture2DSampler_GrSLType + 0, // kTexture2DISampler_GrSLType 0, // kTextureExternalSampler_GrSLType 0, // kTexture2DRectSampler_GrSLType 0, // kTextureBufferSampler_GrSLType @@ -91,14 +94,15 @@ static inline uint32_t grsltype_to_vk_size(GrSLType type) { GR_STATIC_ASSERT(6 == kMat33f_GrSLType); GR_STATIC_ASSERT(7 == kMat44f_GrSLType); GR_STATIC_ASSERT(8 == kTexture2DSampler_GrSLType); - GR_STATIC_ASSERT(9 == kTextureExternalSampler_GrSLType); - GR_STATIC_ASSERT(10 == kTexture2DRectSampler_GrSLType); - GR_STATIC_ASSERT(11 == kTextureBufferSampler_GrSLType); - GR_STATIC_ASSERT(12 == kBool_GrSLType); - GR_STATIC_ASSERT(13 == kInt_GrSLType); - GR_STATIC_ASSERT(14 == kUint_GrSLType); - GR_STATIC_ASSERT(15 == kTexture2D_GrSLType); - GR_STATIC_ASSERT(16 == kSampler_GrSLType); + GR_STATIC_ASSERT(9 == kTexture2DISampler_GrSLType); + GR_STATIC_ASSERT(10 == kTextureExternalSampler_GrSLType); + GR_STATIC_ASSERT(11 == kTexture2DRectSampler_GrSLType); + GR_STATIC_ASSERT(12 == kTextureBufferSampler_GrSLType); + GR_STATIC_ASSERT(13 == kBool_GrSLType); + GR_STATIC_ASSERT(14 == kInt_GrSLType); + GR_STATIC_ASSERT(15 == kUint_GrSLType); + GR_STATIC_ASSERT(16 == kTexture2D_GrSLType); + GR_STATIC_ASSERT(17 == kSampler_GrSLType); GR_STATIC_ASSERT(SK_ARRAY_COUNT(kSizes) == kGrSLTypeCount); } |