Enable -Wextra-semi and -Wextra-semi-stmt.
This will prevent users from accidentally making semicolon errors in
the future.
Bug: chromium:926235
Change-Id: I79a6fa376fb1ad8f0fcf1b65b1f572a035d1f4e9
Reviewed-on: https://chromium-review.googlesource.com/c/1446493
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
diff --git a/src/libANGLE/renderer/EGLSyncImpl.h b/src/libANGLE/renderer/EGLSyncImpl.h
index ebf8f79..9d910c4 100644
--- a/src/libANGLE/renderer/EGLSyncImpl.h
+++ b/src/libANGLE/renderer/EGLSyncImpl.h
@@ -25,8 +25,8 @@
class EGLSyncImpl : angle::NonCopyable
{
public:
- EGLSyncImpl(){};
- virtual ~EGLSyncImpl(){};
+ EGLSyncImpl() {}
+ virtual ~EGLSyncImpl() {}
virtual void onDestroy(const egl::Display *display) {}
diff --git a/src/libANGLE/renderer/ProgramImpl.h b/src/libANGLE/renderer/ProgramImpl.h
index 384ddae..bd19069 100644
--- a/src/libANGLE/renderer/ProgramImpl.h
+++ b/src/libANGLE/renderer/ProgramImpl.h
@@ -35,7 +35,7 @@
class LinkEvent : angle::NonCopyable
{
public:
- virtual ~LinkEvent(){};
+ virtual ~LinkEvent() {}
// Please be aware that these methods may be called under a gl::Context other
// than the one where the LinkEvent was created.
diff --git a/src/libANGLE/renderer/d3d/ImageD3D.h b/src/libANGLE/renderer/d3d/ImageD3D.h
index 04dd38b..70b1e12 100644
--- a/src/libANGLE/renderer/d3d/ImageD3D.h
+++ b/src/libANGLE/renderer/d3d/ImageD3D.h
@@ -38,7 +38,7 @@
{
public:
ImageD3D();
- virtual ~ImageD3D(){};
+ virtual ~ImageD3D() {}
GLsizei getWidth() const { return mWidth; }
GLsizei getHeight() const { return mHeight; }
diff --git a/src/libANGLE/renderer/d3d/ProgramD3D.cpp b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
index d43e560..edd6d2a 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -263,7 +263,7 @@
*sizeOut = sizeIter->second;
return true;
-};
+}
bool InterfaceBlockInfo::getBlockMemberInfo(const std::string &name,
const std::string &mappedName,
@@ -278,7 +278,7 @@
*infoOut = infoIter->second;
return true;
-};
+}
// Helper class that gathers uniform info from the default uniform block.
class UniformEncodingVisitorD3D : public sh::BlockEncoderVisitor
diff --git a/src/libANGLE/renderer/d3d/RendererD3D.h b/src/libANGLE/renderer/d3d/RendererD3D.h
index 888c5ca..18c7b8e 100644
--- a/src/libANGLE/renderer/d3d/RendererD3D.h
+++ b/src/libANGLE/renderer/d3d/RendererD3D.h
@@ -92,7 +92,7 @@
// ANGLE_TRY for HRESULT errors.
#define ANGLE_TRY_HR(CONTEXT, EXPR, MESSAGE) \
- \
+ do \
{ \
auto ANGLE_LOCAL_VAR = (EXPR); \
if (ANGLE_UNLIKELY(FAILED(ANGLE_LOCAL_VAR))) \
@@ -100,16 +100,17 @@
CONTEXT->handleResult(ANGLE_LOCAL_VAR, MESSAGE, __FILE__, ANGLE_FUNCTION, __LINE__); \
return angle::Result::Stop; \
} \
- }
+ } while (0)
#define ANGLE_CHECK_HR(CONTEXT, EXPR, MESSAGE, ERROR) \
+ do \
{ \
if (ANGLE_UNLIKELY(!(EXPR))) \
{ \
CONTEXT->handleResult(ERROR, MESSAGE, __FILE__, ANGLE_FUNCTION, __LINE__); \
return angle::Result::Stop; \
} \
- }
+ } while (0)
#define ANGLE_HR_UNREACHABLE(context) \
UNREACHABLE(); \
diff --git a/src/libANGLE/renderer/d3d/TextureD3D.h b/src/libANGLE/renderer/d3d/TextureD3D.h
index 8d2dfaf..4eb43b5 100644
--- a/src/libANGLE/renderer/d3d/TextureD3D.h
+++ b/src/libANGLE/renderer/d3d/TextureD3D.h
@@ -160,7 +160,7 @@
angle::Result releaseTexStorage(const gl::Context *context);
- GLuint getBaseLevel() const { return mBaseLevel; };
+ GLuint getBaseLevel() const { return mBaseLevel; }
virtual void markAllImagesDirty() = 0;
diff --git a/src/libANGLE/renderer/d3d/VertexBuffer.h b/src/libANGLE/renderer/d3d/VertexBuffer.h
index 2376fbb..2b91b9f 100644
--- a/src/libANGLE/renderer/d3d/VertexBuffer.h
+++ b/src/libANGLE/renderer/d3d/VertexBuffer.h
@@ -62,7 +62,7 @@
unsigned int getSerial() const;
// This may be overridden (e.g. by VertexBuffer11) if necessary.
- virtual void hintUnmapResource(){};
+ virtual void hintUnmapResource() {}
// Reference counting.
void addRef();
diff --git a/src/libANGLE/renderer/d3d/d3d11/Blit11Helper_autogen.inc b/src/libANGLE/renderer/d3d/d3d11/Blit11Helper_autogen.inc
index 5c9434c..5662700 100644
--- a/src/libANGLE/renderer/d3d/d3d11/Blit11Helper_autogen.inc
+++ b/src/libANGLE/renderer/d3d/d3d11/Blit11Helper_autogen.inc
@@ -1,7 +1,7 @@
// GENERATED FILE - DO NOT EDIT.
// Generated by gen_blit11helper.py.
//
-// Copyright 2018 The ANGLE Project Authors. All rights reserved.
+// Copyright 2019 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
@@ -914,7 +914,7 @@
UNREACHABLE();
return BLITSHADER_INVALID;
}
-};
+}
angle::Result Blit11::mapBlitShader(const gl::Context *context,
BlitShaderType blitShaderType)
diff --git a/src/libANGLE/renderer/d3d/d3d11/Renderer11.h b/src/libANGLE/renderer/d3d/d3d11/Renderer11.h
index dcdd4c4..9861b9b 100644
--- a/src/libANGLE/renderer/d3d/d3d11/Renderer11.h
+++ b/src/libANGLE/renderer/d3d/d3d11/Renderer11.h
@@ -317,9 +317,9 @@
// D3D11-renderer specific methods
ID3D11Device *getDevice() { return mDevice; }
void *getD3DDevice() override;
- ID3D11DeviceContext *getDeviceContext() { return mDeviceContext; };
- ID3D11DeviceContext1 *getDeviceContext1IfSupported() { return mDeviceContext1; };
- IDXGIFactory *getDxgiFactory() { return mDxgiFactory; };
+ ID3D11DeviceContext *getDeviceContext() { return mDeviceContext; }
+ ID3D11DeviceContext1 *getDeviceContext1IfSupported() { return mDeviceContext1; }
+ IDXGIFactory *getDxgiFactory() { return mDxgiFactory; }
angle::Result getBlendState(const gl::Context *context,
const d3d11::BlendStateKey &key,
@@ -388,7 +388,7 @@
bool stencilBlit);
bool isES3Capable() const;
- const Renderer11DeviceCaps &getRenderer11DeviceCaps() const { return mRenderer11DeviceCaps; };
+ const Renderer11DeviceCaps &getRenderer11DeviceCaps() const { return mRenderer11DeviceCaps; }
RendererClass getRendererClass() const override;
StateManager11 *getStateManager() { return &mStateManager; }
diff --git a/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp b/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
index 9fcd8a5..e88b906 100644
--- a/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
@@ -97,9 +97,9 @@
break;
}
- ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_ATTRIB_FUNC);
- ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_BINDING_FUNC);
- ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_BUFFER_DATA_FUNC);
+ ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_ATTRIB_FUNC)
+ ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_BINDING_FUNC)
+ ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_BUFFER_DATA_FUNC)
default:
UNREACHABLE();
diff --git a/src/libANGLE/renderer/d3d/d3d11/d3d11_blit_shaders_autogen.gni b/src/libANGLE/renderer/d3d/d3d11/d3d11_blit_shaders_autogen.gni
index 185810e..988ae52 100644
--- a/src/libANGLE/renderer/d3d/d3d11/d3d11_blit_shaders_autogen.gni
+++ b/src/libANGLE/renderer/d3d/d3d11/d3d11_blit_shaders_autogen.gni
@@ -1,7 +1,7 @@
# GENERATED FILE - DO NOT EDIT.
# Generated by gen_blit11helper.py.
#
-# Copyright 2018 The ANGLE Project Authors. All rights reserved.
+# Copyright 2019 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
diff --git a/src/libANGLE/renderer/d3d/d3d11/gen_blit11helper.py b/src/libANGLE/renderer/d3d/d3d11/gen_blit11helper.py
index 3b04689..d262b43 100644
--- a/src/libANGLE/renderer/d3d/d3d11/gen_blit11helper.py
+++ b/src/libANGLE/renderer/d3d/d3d11/gen_blit11helper.py
@@ -45,7 +45,7 @@
UNREACHABLE();
return BLITSHADER_INVALID;
}}
-}};
+}}
angle::Result Blit11::mapBlitShader(const gl::Context *context,
BlitShaderType blitShaderType)
diff --git a/src/libANGLE/renderer/gl/QueryGL.cpp b/src/libANGLE/renderer/gl/QueryGL.cpp
index 23f4ef6..459e555 100644
--- a/src/libANGLE/renderer/gl/QueryGL.cpp
+++ b/src/libANGLE/renderer/gl/QueryGL.cpp
@@ -326,7 +326,7 @@
else if (nativegl::SupportsOcclusionQueries(mFunctions))
{
mSyncProvider.reset(new SyncProviderGLQuery(mFunctions));
- ANGLE_TRY(mSyncProvider->init(context, gl::QueryType::AnySamples))
+ ANGLE_TRY(mSyncProvider->init(context, gl::QueryType::AnySamples));
}
else
{
diff --git a/src/libANGLE/renderer/gl/VertexArrayGL.cpp b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
index 897a11c..dc8264f 100644
--- a/src/libANGLE/renderer/gl/VertexArrayGL.cpp
+++ b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
@@ -690,9 +690,9 @@
case VertexArray::DIRTY_BIT_ELEMENT_ARRAY_BUFFER_DATA:
break;
- ANGLE_VERTEX_INDEX_CASES(ANGLE_DIRTY_ATTRIB_FUNC);
- ANGLE_VERTEX_INDEX_CASES(ANGLE_DIRTY_BINDING_FUNC);
- ANGLE_VERTEX_INDEX_CASES(ANGLE_DIRTY_BUFFER_DATA_FUNC);
+ ANGLE_VERTEX_INDEX_CASES(ANGLE_DIRTY_ATTRIB_FUNC)
+ ANGLE_VERTEX_INDEX_CASES(ANGLE_DIRTY_BINDING_FUNC)
+ ANGLE_VERTEX_INDEX_CASES(ANGLE_DIRTY_BUFFER_DATA_FUNC)
default:
UNREACHABLE();
diff --git a/src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp b/src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp
index 7c88f65..ac03341 100644
--- a/src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp
+++ b/src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp
@@ -145,11 +145,14 @@
egl::Error FunctionsEGL::initialize(EGLNativeDisplayType nativeDisplay)
{
-#define ANGLE_GET_PROC_OR_ERROR(MEMBER, NAME) \
- if (!SetPtr(MEMBER, getProcAddress(#NAME))) \
- { \
- return egl::EglNotInitialized() << "Could not load EGL entry point " #NAME; \
- }
+#define ANGLE_GET_PROC_OR_ERROR(MEMBER, NAME) \
+ do \
+ { \
+ if (!SetPtr(MEMBER, getProcAddress(#NAME))) \
+ { \
+ return egl::EglNotInitialized() << "Could not load EGL entry point " #NAME; \
+ } \
+ } while (0)
ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->bindAPIPtr, eglBindAPI);
ANGLE_GET_PROC_OR_ERROR(&mFnPtrs->chooseConfigPtr, eglChooseConfig);
diff --git a/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp b/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp
index bb9fb6a..1304622 100644
--- a/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp
+++ b/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp
@@ -150,16 +150,19 @@
getProc = reinterpret_cast<PFNGETPROCPROC>(glXGetProcAddress);
#endif
-#define GET_PROC_OR_ERROR(MEMBER, NAME) \
- if (!GetProc(getProc, MEMBER, #NAME)) \
- { \
- *errorString = "Could not load GLX entry point " #NAME; \
- return false; \
- }
+#define GET_PROC_OR_ERROR(MEMBER, NAME) \
+ do \
+ { \
+ if (!GetProc(getProc, MEMBER, #NAME)) \
+ { \
+ *errorString = "Could not load GLX entry point " #NAME; \
+ return false; \
+ } \
+ } while (0)
#if !defined(ANGLE_LINK_GLX)
# define GET_FNPTR_OR_ERROR(MEMBER, NAME) GET_PROC_OR_ERROR(MEMBER, NAME)
#else
-# define GET_FNPTR_OR_ERROR(MEMBER, NAME) *MEMBER = NAME;
+# define GET_FNPTR_OR_ERROR(MEMBER, NAME) *MEMBER = NAME
#endif
// GLX 1.0
diff --git a/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp b/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
index bf32090..2a41387 100644
--- a/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
+++ b/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
@@ -1006,19 +1006,22 @@
HDC workerDeviceContext = nullptr;
HGLRC workerContext = nullptr;
-#define CLEANUP_ON_ERROR() \
- if (workerContext) \
- { \
- mFunctionsWGL->deleteContext(workerContext); \
- } \
- if (workerDeviceContext) \
- { \
- mFunctionsWGL->releasePbufferDCARB(workerPbuffer, workerDeviceContext); \
- } \
- if (workerPbuffer) \
- { \
- mFunctionsWGL->destroyPbufferARB(workerPbuffer); \
- }
+#define CLEANUP_ON_ERROR() \
+ do \
+ { \
+ if (workerContext) \
+ { \
+ mFunctionsWGL->deleteContext(workerContext); \
+ } \
+ if (workerDeviceContext) \
+ { \
+ mFunctionsWGL->releasePbufferDCARB(workerPbuffer, workerDeviceContext); \
+ } \
+ if (workerPbuffer) \
+ { \
+ mFunctionsWGL->destroyPbufferARB(workerPbuffer); \
+ } \
+ } while (0)
const int attribs[] = {0, 0};
workerPbuffer = mFunctionsWGL->createPbufferARB(mDeviceContext, mPixelFormat, 1, 1, attribs);
diff --git a/src/libANGLE/renderer/renderer_utils.cpp b/src/libANGLE/renderer/renderer_utils.cpp
index ed4b629..4cbc899 100644
--- a/src/libANGLE/renderer/renderer_utils.cpp
+++ b/src/libANGLE/renderer/renderer_utils.cpp
@@ -577,7 +577,7 @@
// unsigned integers(with wrapping on overflow conditions)." ANGLE does not fully handle
// these rules, an overflow error is returned if the start vertex cannot be stored in a
// 32-bit signed integer.
- ANGLE_CHECK_GL_MATH(contextImpl, startVertexInt64 <= std::numeric_limits<GLint>::max())
+ ANGLE_CHECK_GL_MATH(contextImpl, startVertexInt64 <= std::numeric_limits<GLint>::max());
*firstVertexOut = static_cast<GLint>(startVertexInt64);
return angle::Result::Continue;
diff --git a/src/libANGLE/renderer/vulkan/ContextVk.cpp b/src/libANGLE/renderer/vulkan/ContextVk.cpp
index 9af3932..cda4488 100644
--- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
@@ -326,7 +326,7 @@
for (size_t attribIndex : mDirtyDefaultAttribsMask)
{
- ANGLE_TRY(updateDefaultAttribute(attribIndex))
+ ANGLE_TRY(updateDefaultAttribute(attribIndex));
}
mDirtyDefaultAttribsMask.reset();
diff --git a/src/libANGLE/renderer/vulkan/GlslangWrapper.cpp b/src/libANGLE/renderer/vulkan/GlslangWrapper.cpp
index 132fe1b..d0677d6 100644
--- a/src/libANGLE/renderer/vulkan/GlslangWrapper.cpp
+++ b/src/libANGLE/renderer/vulkan/GlslangWrapper.cpp
@@ -8,6 +8,9 @@
#include "libANGLE/renderer/vulkan/GlslangWrapper.h"
+// glslang has issues with some specific warnings.
+ANGLE_DISABLE_EXTRA_SEMI_WARNING
+
// glslang's version of ShaderLang.h, not to be confused with ANGLE's.
#include <glslang/Public/ShaderLang.h>
@@ -15,6 +18,8 @@
#include <SPIRV/GlslangToSpv.h>
#include <StandAlone/ResourceLimits.h>
+ANGLE_REENABLE_EXTRA_SEMI_WARNING
+
#include <array>
#include "common/FixedVector.h"
diff --git a/src/libANGLE/renderer/vulkan/SyncVk.cpp b/src/libANGLE/renderer/vulkan/SyncVk.cpp
index 0de3afa..fb2beba 100644
--- a/src/libANGLE/renderer/vulkan/SyncVk.cpp
+++ b/src/libANGLE/renderer/vulkan/SyncVk.cpp
@@ -241,7 +241,7 @@
UNREACHABLE();
*outResult = EGL_FALSE;
return egl::Error(EGL_BAD_ALLOC);
- };
+ }
}
egl::Error EGLSyncVk::serverWait(const egl::Display *display, EGLint flags)
diff --git a/src/libANGLE/renderer/vulkan/UtilsVk.cpp b/src/libANGLE/renderer/vulkan/UtilsVk.cpp
index 0d403a5..1fba26f 100644
--- a/src/libANGLE/renderer/vulkan/UtilsVk.cpp
+++ b/src/libANGLE/renderer/vulkan/UtilsVk.cpp
@@ -620,7 +620,7 @@
vk::CommandBuffer *commandBuffer;
if (!framebuffer->appendToStartedRenderPass(renderer->getCurrentQueueSerial(), &commandBuffer))
{
- ANGLE_TRY(framebuffer->startNewRenderPass(contextVk, &commandBuffer))
+ ANGLE_TRY(framebuffer->startNewRenderPass(contextVk, &commandBuffer));
}
ImageClearShaderParams shaderParams;
diff --git a/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp b/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
index 1cdcbaa..16a5b4d 100644
--- a/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
+++ b/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
@@ -357,7 +357,7 @@
(*attribBits)[INDEX].reset(); \
break;
- ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_ATTRIB_FUNC);
+ ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_ATTRIB_FUNC)
#define ANGLE_VERTEX_DIRTY_BINDING_FUNC(INDEX) \
case gl::VertexArray::DIRTY_BIT_BINDING_0 + INDEX: \
@@ -367,7 +367,7 @@
(*bindingBits)[INDEX].reset(); \
break;
- ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_BINDING_FUNC);
+ ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_BINDING_FUNC)
#define ANGLE_VERTEX_DIRTY_BUFFER_DATA_FUNC(INDEX) \
case gl::VertexArray::DIRTY_BIT_BUFFER_DATA_0 + INDEX: \
@@ -375,7 +375,7 @@
bindings[attribs[INDEX].bindingIndex], INDEX)); \
break;
- ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_BUFFER_DATA_FUNC);
+ ANGLE_VERTEX_INDEX_CASES(ANGLE_VERTEX_DIRTY_BUFFER_DATA_FUNC)
default:
UNREACHABLE();
diff --git a/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp b/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
index 0777ac3..a9f6949 100644
--- a/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_cache_utils.cpp
@@ -280,7 +280,7 @@
// Helper macro that casts to a bitfield type then verifies no bits were dropped.
#define SetBitField(lhs, rhs) \
lhs = static_cast<typename std::decay<decltype(lhs)>::type>(rhs); \
- ASSERT(static_cast<decltype(rhs)>(lhs) == (rhs));
+ ASSERT(static_cast<decltype(rhs)>(lhs) == (rhs))
// When converting a byte number to a transition bit index we can shift instead of divide.
constexpr size_t kTransitionByteShift = Log2(kGraphicsPipelineDirtyBitBytes);
diff --git a/src/libANGLE/renderer/vulkan/vk_helpers.h b/src/libANGLE/renderer/vulkan/vk_helpers.h
index 2ab9a2a..ab00a9b 100644
--- a/src/libANGLE/renderer/vulkan/vk_helpers.h
+++ b/src/libANGLE/renderer/vulkan/vk_helpers.h
@@ -64,7 +64,7 @@
// This frees resources immediately.
void destroy(VkDevice device);
- BufferHelper *getCurrentBuffer() { return mBuffer; };
+ BufferHelper *getCurrentBuffer() { return mBuffer; }
// For testing only!
void setMinimumSizeForTesting(size_t minSize);
diff --git a/src/libANGLE/renderer/vulkan/vk_utils.h b/src/libANGLE/renderer/vulkan/vk_utils.h
index f7a6ada..60aa808 100644
--- a/src/libANGLE/renderer/vulkan/vk_utils.h
+++ b/src/libANGLE/renderer/vulkan/vk_utils.h
@@ -45,7 +45,7 @@
struct VertexAttribute;
class VertexBinding;
-ANGLE_GL_OBJECTS_X(ANGLE_PRE_DECLARE_OBJECT);
+ANGLE_GL_OBJECTS_X(ANGLE_PRE_DECLARE_OBJECT)
} // namespace gl
#define ANGLE_PRE_DECLARE_VK_OBJECT(OBJ) class OBJ##Vk;
@@ -66,7 +66,7 @@
namespace rx
{
-ANGLE_GL_OBJECTS_X(ANGLE_PRE_DECLARE_VK_OBJECT);
+ANGLE_GL_OBJECTS_X(ANGLE_PRE_DECLARE_VK_OBJECT)
const char *VulkanResultString(VkResult result);
// Verify that validation layers are available.