commit aaca96eedc7cf734ee5f07369a2f785d97dcd996
author Jamie Madill <jmadill@chromium.org> Tue Jun 12 10:19:48 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Tue Jun 12 14:46:41 2018 +0000
tree 669d78f64ee1d84c400c98431facfaa5f06d06e4
parent e18b814797b8f0033f68a5cddd9ac78b88a1604a

Vulkan: Minor style fixes.

Makes some methods const or static. Fixes parameter names. explicit
single argument constructors. Other small style fixes.

Bug: angleproject:2462
Change-Id: Ie2bf96603e9eda81d6f2aa788867978de10e9992
Reviewed-on: https://chromium-review.googlesource.com/1089805
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Luc Ferron <lucferron@chromium.org>
Reviewed-by: Frank Henigman <fjhenigman@chromium.org>

src/libANGLE/renderer/vulkan/RendererVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/RendererVk.cpp b/src/libANGLE/renderer/vulkan/RendererVk.cpp
index 96b6eb8..8a2ed93 100644
--- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
@@ -101,7 +101,7 @@
 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 @@
         }
     }
 
-    bool canEnableValidationLayers() { return mEnableValidationLayers; }
+    bool canEnableValidationLayers() const { return mEnableValidationLayers; }
 
   private:
     bool mEnableValidationLayers;
@@ -163,13 +163,9 @@
 }  // 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 @@
       mDevice(VK_NULL_HANDLE),
       mGlslangWrapper(nullptr),
       mLastCompletedQueueSerial(mQueueSerialFactory.generate()),
-      mCurrentQueueSerial(mQueueSerialFactory.generate()),
-      mInFlightCommands()
+      mCurrentQueueSerial(mQueueSerialFactory.generate())
 {
 }
 
@@ -293,12 +288,11 @@
     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 @@
         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 @@
                               gl::IMPLEMENTATION_MAX_ACTIVE_TEXTURES);
 }
 
-uint32_t RendererVk::getUniformBufferDescriptorCount()
-{
-    return kUniformBufferDescriptorsPerDescriptorSet;
-}
-
 const vk::CommandPool &RendererVk::getCommandPool() const
 {
     return mCommandPool;
@@ -784,7 +775,7 @@
     return vk::NoError();
 }
 
-GlslangWrapper *RendererVk::getGlslangWrapper()
+GlslangWrapper *RendererVk::getGlslangWrapper() const
 {
     return mGlslangWrapper;
 }
@@ -794,7 +785,7 @@
     return mCurrentQueueSerial;
 }
 
-bool RendererVk::isSerialInUse(Serial serial)
+bool RendererVk::isSerialInUse(Serial serial) const
 {
     return serial > mLastCompletedQueueSerial;
 }
@@ -1024,4 +1015,9 @@
     return &mShaderLibrary;
 }
 
+uint32_t GetUniformBufferDescriptorCount()
+{
+    return kUniformBufferDescriptorsPerDescriptorSet;
+}
+
 }  // namespace rx