Add support for sampling stencil texture

src/libANGLE/Texture.h

@@ -134,6 +134,7 @@ class TextureState final : private angle::NonCopyable
     const SamplerState &getSamplerState() const { return mSamplerState; }
     GLenum getUsage() const { return mUsage; }
     GLenum getDepthStencilTextureMode() const { return mDepthStencilTextureMode; }
+    bool isStencilMode() const { return mDepthStencilTextureMode == GL_STENCIL_INDEX; }
 
     // Returns the desc of the base level. Only valid for cube-complete/mip-complete textures.
     const ImageDesc &getBaseLevelDesc() const;

src/libANGLE/renderer/vulkan/TextureVk.h

@@ -173,6 +173,19 @@ class TextureVk : public TextureImpl
     }
 
   private:
+    struct TextureVkViews final : angle::NonCopyable
+    {
+        TextureVkViews();
+        ~TextureVkViews();
+
+        void release(ContextVk *contextVk, Serial currentSerial);
+        vk::ImageView mDrawBaseLevelImageView;
+        vk::ImageView mReadBaseLevelImageView;
+        vk::ImageView mReadMipmapImageView;
+        vk::ImageView mFetchBaseLevelImageView;
+        vk::ImageView mFetchMipmapImageView;
+    };
+
     // Transform an image index from the frontend into one that can be used on the backing
     // ImageHelper, taking into account mipmap or cube face offsets
     gl::ImageIndex getNativeImageIndex(const gl::ImageIndex &inputImageIndex) const;
@@ -283,6 +296,13 @@ class TextureVk : public TextureImpl
                                  uint32_t levelCount,
                                  uint32_t layerCount);
     angle::Result init3DRenderTargets(ContextVk *contextVk);
+    angle::Result initImageViewImpl(ContextVk *contextVk,
+                                    const vk::Format &format,
+                                    uint32_t levelCount,
+                                    uint32_t layerCount,
+                                    TextureVkViews *views,
+                                    VkImageAspectFlags aspectFlags,
+                                    gl::SwizzleState mappedSwizzle);
     angle::Result initCubeMapRenderTargets(ContextVk *contextVk);
 
     angle::Result ensureImageInitializedImpl(ContextVk *contextVk,
@@ -292,6 +312,8 @@ class TextureVk : public TextureImpl
 
     void onStagingBufferChange() { onStateChange(angle::SubjectMessage::SubjectChanged); }
 
+    const TextureVkViews *getTextureViews() const;
+
     bool mOwnsImage;
 
     gl::TextureType mImageNativeType;
@@ -306,11 +328,8 @@ class TextureVk : public TextureImpl
 
     vk::ImageHelper *mImage;
 
-    vk::ImageView mDrawBaseLevelImageView;
-    vk::ImageView mReadBaseLevelImageView;
-    vk::ImageView mReadMipmapImageView;
-    vk::ImageView mFetchBaseLevelImageView;
-    vk::ImageView mFetchMipmapImageView;
+    TextureVkViews mDefaultViews;
+    TextureVkViews mStencilViews;
     std::vector<std::vector<vk::ImageView>> mLayerLevelDrawImageViews;
     vk::Sampler mSampler;
 

src/tests/deqp_support/deqp_gles31_test_expectations.txt

@@ -695,8 +695,10 @@
 // Transform feedback:
 3205 VULKAN : dEQP-GLES31.functional.debug.*transform_feedback = SKIP
 
-// Stencil textures (some missing support for 3D and 2D array textures):
-3585 VULKAN : dEQP-GLES31.functional.stencil_texturing.* = SKIP
+// Stencil textures (some missing support for base level):
+3683 VULKAN PIXEL2 : dEQP-GLES31.functional.stencil_texturing.format.* = FAIL
+3683 VULKAN PIXEL2 : dEQP-GLES31.functional.stencil_texturing.misc.compare_mode_effect = FAIL
+3148 VULKAN : dEQP-GLES31.functional.stencil_texturing.misc.base_level = SKIP
 
 // Multisampled textures:
 3565 VULKAN : dEQP-GLES31.functional.texture.multisample.* = SKIP