Vulkan: Minor style fixes.

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -80,8 +80,7 @@ gl::Error ContextVk::getIncompleteTexture(const gl::Context *context,
 
 gl::Error ContextVk::initialize()
 {
-    ANGLE_TRY(mDynamicDescriptorPool.init(this->getDevice(),
-                                          mRenderer->getUniformBufferDescriptorCount(),
+    ANGLE_TRY(mDynamicDescriptorPool.init(this->getDevice(), GetUniformBufferDescriptorCount(),
                                           mRenderer->getMaxActiveTextures()));
 
     mPipelineDesc.reset(new vk::PipelineDesc());

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -101,7 +101,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL DebugReportCallback(VkDebugReportFlagsEXT flags,
 class ScopedVkLoaderEnvironment : angle::NonCopyable
 {
   public:
-    ScopedVkLoaderEnvironment(bool enableValidationLayers)
+    explicit ScopedVkLoaderEnvironment(bool enableValidationLayers)
         : mEnableValidationLayers(enableValidationLayers), mChangedCWD(false)
     {
 // Changing CWD and setting environment variables makes no sense on Android,
@@ -152,7 +152,7 @@ class ScopedVkLoaderEnvironment : angle::NonCopyable
         }
     }
 
-    bool canEnableValidationLayers() { return mEnableValidationLayers; }
+    bool canEnableValidationLayers() const { return mEnableValidationLayers; }
 
   private:
     bool mEnableValidationLayers;
@@ -163,13 +163,9 @@ class ScopedVkLoaderEnvironment : angle::NonCopyable
 }  // anonymous namespace
 
 // CommandBatch implementation.
-RendererVk::CommandBatch::CommandBatch()
-{
-}
+RendererVk::CommandBatch::CommandBatch() = default;
 
-RendererVk::CommandBatch::~CommandBatch()
-{
-}
+RendererVk::CommandBatch::~CommandBatch() = default;
 
 RendererVk::CommandBatch::CommandBatch(CommandBatch &&other)
     : commandPool(std::move(other.commandPool)), fence(std::move(other.fence)), serial(other.serial)
@@ -196,8 +192,7 @@ RendererVk::RendererVk()
       mDevice(VK_NULL_HANDLE),
       mGlslangWrapper(nullptr),
       mLastCompletedQueueSerial(mQueueSerialFactory.generate()),
-      mCurrentQueueSerial(mQueueSerialFactory.generate()),
-      mInFlightCommands()
+      mCurrentQueueSerial(mQueueSerialFactory.generate())
 {
 }
 
@@ -293,12 +288,11 @@ vk::Error RendererVk::initialize(const egl::AttributeMap &attribs, const char *w
     ScopedVkLoaderEnvironment scopedEnvironment(ShouldUseDebugLayers(attribs));
     mEnableValidationLayers = scopedEnvironment.canEnableValidationLayers();
 
-    bool enableNullDriver = false;
 #if !defined(ANGLE_PLATFORM_ANDROID)
     // Mock ICD does not currently run on Android
-    enableNullDriver = (attribs.get(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE,
-                                    EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE) ==
-                        EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE);
+    bool enableNullDriver = (attribs.get(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE,
+                                         EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE) ==
+                             EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE);
     if (enableNullDriver)
     {
         // Override environment variable to use built Mock ICD
@@ -306,6 +300,8 @@ vk::Error RendererVk::initialize(const egl::AttributeMap &attribs, const char *w
         ANGLE_VK_CHECK(angle::SetEnvironmentVar(g_VkICDPathEnv, ANGLE_VK_ICD_JSON),
                        VK_ERROR_INITIALIZATION_FAILED);
     }
+#else
+    constexpr bool enableNullDriver = false;
 #endif  // !defined(ANGLE_PLATFORM_ANDROID)
     // Gather global layer properties.
     uint32_t instanceLayerCount = 0;
@@ -651,11 +647,6 @@ uint32_t RendererVk::getMaxActiveTextures()
                               gl::IMPLEMENTATION_MAX_ACTIVE_TEXTURES);
 }
 
-uint32_t RendererVk::getUniformBufferDescriptorCount()
-{
-    return kUniformBufferDescriptorsPerDescriptorSet;
-}
-
 const vk::CommandPool &RendererVk::getCommandPool() const
 {
     return mCommandPool;
@@ -784,7 +775,7 @@ vk::Error RendererVk::submitFrame(const VkSubmitInfo &submitInfo, vk::CommandBuf
     return vk::NoError();
 }
 
-GlslangWrapper *RendererVk::getGlslangWrapper()
+GlslangWrapper *RendererVk::getGlslangWrapper() const
 {
     return mGlslangWrapper;
 }
@@ -794,7 +785,7 @@ Serial RendererVk::getCurrentQueueSerial() const
     return mCurrentQueueSerial;
 }
 
-bool RendererVk::isSerialInUse(Serial serial)
+bool RendererVk::isSerialInUse(Serial serial) const
 {
     return serial > mLastCompletedQueueSerial;
 }
@@ -1024,4 +1015,9 @@ vk::ShaderLibrary *RendererVk::getShaderLibrary()
     return &mShaderLibrary;
 }
 
+uint32_t GetUniformBufferDescriptorCount()
+{
+    return kUniformBufferDescriptorsPerDescriptorSet;
+}
+
 }  // namespace rx

src/libANGLE/renderer/vulkan/RendererVk.h

@@ -68,13 +68,12 @@ class RendererVk : angle::NonCopyable
     const gl::Extensions &getNativeExtensions() const;
     const gl::Limitations &getNativeLimitations() const;
     uint32_t getMaxActiveTextures();
-    uint32_t getUniformBufferDescriptorCount();
 
-    GlslangWrapper *getGlslangWrapper();
+    GlslangWrapper *getGlslangWrapper() const;
 
     Serial getCurrentQueueSerial() const;
 
-    bool isSerialInUse(Serial serial);
+    bool isSerialInUse(Serial serial) const;
 
     template <typename T>
     void releaseObject(Serial resourceSerial, T *object)
@@ -137,7 +136,7 @@ class RendererVk : angle::NonCopyable
   private:
     vk::Error initializeDevice(uint32_t queueFamilyIndex);
     void ensureCapsInitialized() const;
-    vk::Error submitFrame(const VkSubmitInfo &submitInfo, vk::CommandBuffer &&commandBatch);
+    vk::Error submitFrame(const VkSubmitInfo &submitInfo, vk::CommandBuffer &&commandBuffer);
     vk::Error checkInFlightCommands();
     void freeAllInFlightResources();
     vk::Error flushCommandGraph(const gl::Context *context, vk::CommandBuffer *commandBatch);
@@ -200,6 +199,8 @@ class RendererVk : angle::NonCopyable
     vk::ShaderLibrary mShaderLibrary;
 };
 
+uint32_t GetUniformBufferDescriptorCount();
+
 }  // namespace rx
 
 #endif  // LIBANGLE_RENDERER_VULKAN_RENDERERVK_H_

src/libANGLE/renderer/vulkan/vk_cache_utils.cpp

@@ -250,9 +250,7 @@ RenderPassDesc::RenderPassDesc()
     memset(this, 0, sizeof(RenderPassDesc));
 }
 
-RenderPassDesc::~RenderPassDesc()
-{
-}
+RenderPassDesc::~RenderPassDesc() = default;
 
 RenderPassDesc::RenderPassDesc(const RenderPassDesc &other)
 {
@@ -339,9 +337,7 @@ PipelineDesc::PipelineDesc()
     memset(this, 0, sizeof(PipelineDesc));
 }
 
-PipelineDesc::~PipelineDesc()
-{
-}
+PipelineDesc::~PipelineDesc() = default;
 
 PipelineDesc::PipelineDesc(const PipelineDesc &other)
 {
@@ -383,9 +379,9 @@ void PipelineDesc::initDefaults()
     mMultisampleStateInfo.rasterizationSamples = 1;
     mMultisampleStateInfo.sampleShadingEnable  = 0;
     mMultisampleStateInfo.minSampleShading     = 0.0f;
-    for (int maskIndex = 0; maskIndex < gl::MAX_SAMPLE_MASK_WORDS; ++maskIndex)
+    for (uint32_t &sampleMask : mMultisampleStateInfo.sampleMask)
     {
-        mMultisampleStateInfo.sampleMask[maskIndex] = 0;
+        sampleMask = 0;
     }
     mMultisampleStateInfo.alphaToCoverageEnable = 0;
     mMultisampleStateInfo.alphaToOneEnable      = 0;
@@ -818,9 +814,7 @@ AttachmentOpsArray::AttachmentOpsArray()
     memset(&mOps, 0, sizeof(PackedAttachmentOpsDesc) * mOps.size());
 }
 
-AttachmentOpsArray::~AttachmentOpsArray()
-{
-}
+AttachmentOpsArray::~AttachmentOpsArray() = default;
 
 AttachmentOpsArray::AttachmentOpsArray(const AttachmentOpsArray &other)
 {
@@ -869,9 +863,7 @@ bool operator==(const AttachmentOpsArray &lhs, const AttachmentOpsArray &rhs)
 }  // namespace vk
 
 // RenderPassCache implementation.
-RenderPassCache::RenderPassCache()
-{
-}
+RenderPassCache::RenderPassCache() = default;
 
 RenderPassCache::~RenderPassCache()
 {
@@ -967,9 +959,7 @@ vk::Error RenderPassCache::getRenderPassWithOps(VkDevice device,
 }
 
 // PipelineCache implementation.
-PipelineCache::PipelineCache()
-{
-}
+PipelineCache::PipelineCache() = default;
 
 PipelineCache::~PipelineCache()
 {

src/libANGLE/renderer/vulkan/vk_cache_utils.h

@@ -298,8 +298,8 @@ class PipelineDesc final
     // Blend states
     void updateBlendEnabled(bool isBlendEnabled);
     void updateBlendColor(const gl::ColorF &color);
-    void updateBlendFuncs(const gl::BlendState &blend_state);
-    void updateBlendEquations(const gl::BlendState &blend_state);
+    void updateBlendFuncs(const gl::BlendState &blendState);
+    void updateBlendEquations(const gl::BlendState &blendState);
     void updateColorWriteMask(VkColorComponentFlags colorComponentFlags);
 
     // Depth/stencil states.