Skip to content

A
angle
Commit 180973c7 by Corentin Wallez Committed by Commit Bot
Options

Fix params.h compilation.

The ANGLE_PARAM_TYPE_INFO macro was referencing the TypeInfo static member that was only added when release asserts are enabled. BUG=angleproject:747 BUG=chromium:716323 Change-Id: I0657dde69c62ab697b3c095fe19f38c130188cef Reviewed-on: https://chromium-review.googlesource.com/490687Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
parent 5416f753
Showing with 0 additions and 4 deletions
src/libANGLE/params.cpp
...@@ -16,11 +16,9 @@ ...@@ -16,11 +16,9 @@
namespace gl namespace gl
{ {
#if defined(ANGLE_ENABLE_ASSERTS)
// static // static
constexpr ParamTypeInfo ParamsBase::TypeInfo; constexpr ParamTypeInfo ParamsBase::TypeInfo;
constexpr ParamTypeInfo HasIndexRange::TypeInfo; constexpr ParamTypeInfo HasIndexRange::TypeInfo;
#endif // defined(ANGLE_ENABLE_ASSERTS)
ParamsBase::ParamsBase(Context *context, ...) ParamsBase::ParamsBase(Context *context, ...)
{ {
......
src/libANGLE/params.h
...@@ -67,9 +67,7 @@ class ParamsBase : angle::NonCopyable ...@@ -67,9 +67,7 @@ class ParamsBase : angle::NonCopyable
template <EntryPoint EP, typename... ArgsT> template <EntryPoint EP, typename... ArgsT>
static void Factory(EntryPointParamType<EP> *objBuffer, ArgsT... args); static void Factory(EntryPointParamType<EP> *objBuffer, ArgsT... args);
#if defined(ANGLE_ENABLE_ASSERTS)
static constexpr ParamTypeInfo TypeInfo = {nullptr, nullptr}; static constexpr ParamTypeInfo TypeInfo = {nullptr, nullptr};
#endif // defined(ANGLE_ENABLE_ASSERTS)
}; };
// static // static
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment