Vulkan: Remove vk::ShaderType
Use gl::ShaderType instead. For now, only GLES2 shaders are supported
in ProgramVk.
Bug: angleproject:2522
Change-Id: I17bc9afddb6d39cf45fb4dd37f34c7263a3ed515
Reviewed-on: https://chromium-review.googlesource.com/c/1333970
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
diff --git a/src/libANGLE/renderer/vulkan/ProgramVk.h b/src/libANGLE/renderer/vulkan/ProgramVk.h
index cd3c4a3..a1e6b92 100644
--- a/src/libANGLE/renderer/vulkan/ProgramVk.h
+++ b/src/libANGLE/renderer/vulkan/ProgramVk.h
@@ -167,9 +167,9 @@
std::vector<sh::BlockMemberInfo> uniformLayout;
};
- vk::ShaderMap<DefaultUniformBlock> mDefaultUniformBlocks;
- vk::ShaderBitSet mDefaultUniformBlocksDirty;
- vk::ShaderMap<uint32_t> mUniformBlocksOffsets;
+ gl::ShaderMap<DefaultUniformBlock> mDefaultUniformBlocks;
+ gl::ShaderBitSet mDefaultUniformBlocksDirty;
+ gl::ShaderMap<uint32_t> mUniformBlocksOffsets;
// This is a special "empty" placeholder buffer for when a shader has no uniforms.
// It is necessary because we want to keep a compatible pipeline layout in all cases,