Hash :
acf2f3ad
Author :
Date :
2017-11-21T19:22:44
Apply Chromium style fixes. This addresses several minor code quality issues that are validated in Chromium, but not yet applied to ANGLE: * constructors and destructors must be defined out-of-line * auto is not allowed for simple pointer types * use override everywhere instead of virtual * virtual functions must also be defined out-of-line Slightly reduces binary size for me (~2k on Win, 150k on Linux). Bug: angleproject:1569 Change-Id: I073ca3365188caf5f29fb28d9eb207903c1843e6 Reviewed-on: https://chromium-review.googlesource.com/779959 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267
//
// Copyright (c) 2014 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.
// Error.h: Defines the egl::Error and gl::Error classes which encapsulate API errors
// and optional error messages.
#ifndef LIBANGLE_ERROR_H_
#define LIBANGLE_ERROR_H_
#include <EGL/egl.h>
#include <EGL/eglext.h>
#include "angle_gl.h"
#include "common/angleutils.h"
#include "common/debug.h"
#include <memory>
#include <ostream>
#include <string>
namespace angle
{
template <typename ErrorT, typename ResultT, typename ErrorBaseT, ErrorBaseT NoErrorVal>
class ANGLE_NO_DISCARD ErrorOrResultBase
{
public:
ErrorOrResultBase(const ErrorT &error) : mError(error) {}
ErrorOrResultBase(ErrorT &&error) : mError(std::move(error)) {}
ErrorOrResultBase(ResultT &&result) : mError(NoErrorVal), mResult(std::forward<ResultT>(result))
{
}
ErrorOrResultBase(const ResultT &result) : mError(NoErrorVal), mResult(result) {}
bool isError() const { return mError.isError(); }
const ErrorT &getError() const { return mError; }
ResultT &&getResult() { return std::move(mResult); }
private:
ErrorT mError;
ResultT mResult;
};
template <typename ErrorT, typename ErrorBaseT, ErrorBaseT NoErrorVal, typename CodeT, CodeT EnumT>
class ErrorStreamBase : angle::NonCopyable
{
public:
ErrorStreamBase() : mID(EnumT) {}
ErrorStreamBase(GLuint id) : mID(id) {}
template <typename T>
ErrorStreamBase &operator<<(T value)
{
mErrorStream << value;
return *this;
}
operator ErrorT() { return ErrorT(EnumT, mID, mErrorStream.str()); }
template <typename ResultT>
operator ErrorOrResultBase<ErrorT, ResultT, ErrorBaseT, NoErrorVal>()
{
return static_cast<ErrorT>(*this);
}
private:
GLuint mID;
std::ostringstream mErrorStream;
};
} // namespace angle
namespace egl
{
class Error;
} // namespace egl
namespace gl
{
class ANGLE_NO_DISCARD Error final
{
public:
explicit inline Error(GLenum errorCode);
Error(GLenum errorCode, std::string &&message);
Error(GLenum errorCode, GLuint id, std::string &&message);
inline Error(const Error &other);
inline Error(Error &&other);
inline ~Error() = default;
// automatic error type conversion
inline Error(egl::Error &&eglErr);
inline Error(egl::Error eglErr);
inline Error &operator=(const Error &other);
inline Error &operator=(Error &&other);
inline GLenum getCode() const;
inline GLuint getID() const;
inline bool isError() const;
const std::string &getMessage() const;
// Useful for mocking and testing
bool operator==(const Error &other) const;
bool operator!=(const Error &other) const;
private:
void createMessageString() const;
friend std::ostream &operator<<(std::ostream &os, const Error &err);
friend class egl::Error;
GLenum mCode;
GLuint mID;
mutable std::unique_ptr<std::string> mMessage;
};
template <typename ResultT>
using ErrorOrResult = angle::ErrorOrResultBase<Error, ResultT, GLenum, GL_NO_ERROR>;
namespace priv
{
template <GLenum EnumT>
using ErrorStream = angle::ErrorStreamBase<Error, GLenum, GL_NO_ERROR, GLenum, EnumT>;
} // namespace priv
using InternalError = priv::ErrorStream<GL_INVALID_OPERATION>;
using InvalidEnum = priv::ErrorStream<GL_INVALID_ENUM>;
using InvalidValue = priv::ErrorStream<GL_INVALID_VALUE>;
using InvalidOperation = priv::ErrorStream<GL_INVALID_OPERATION>;
using StackOverflow = priv::ErrorStream<GL_STACK_OVERFLOW>;
using StackUnderflow = priv::ErrorStream<GL_STACK_UNDERFLOW>;
using OutOfMemory = priv::ErrorStream<GL_OUT_OF_MEMORY>;
using InvalidFramebufferOperation = priv::ErrorStream<GL_INVALID_FRAMEBUFFER_OPERATION>;
inline Error NoError()
{
return Error(GL_NO_ERROR);
}
using LinkResult = ErrorOrResult<bool>;
} // namespace gl
namespace egl
{
class ANGLE_NO_DISCARD Error final
{
public:
explicit inline Error(EGLint errorCode);
Error(EGLint errorCode, std::string &&message);
Error(EGLint errorCode, EGLint id, std::string &&message);
inline Error(const Error &other);
inline Error(Error &&other);
inline ~Error() = default;
// automatic error type conversion
inline Error(gl::Error &&glErr);
inline Error(gl::Error glErr);
inline Error &operator=(const Error &other);
inline Error &operator=(Error &&other);
inline EGLint getCode() const;
inline EGLint getID() const;
inline bool isError() const;
const std::string &getMessage() const;
private:
void createMessageString() const;
friend std::ostream &operator<<(std::ostream &os, const Error &err);
friend class gl::Error;
EGLint mCode;
EGLint mID;
mutable std::unique_ptr<std::string> mMessage;
};
template <typename ResultT>
using ErrorOrResult = angle::ErrorOrResultBase<Error, ResultT, EGLint, EGL_SUCCESS>;
namespace priv
{
template <EGLint EnumT>
using ErrorStream = angle::ErrorStreamBase<Error, EGLint, EGL_SUCCESS, EGLint, EnumT>;
} // namespace priv
using EglNotInitialized = priv::ErrorStream<EGL_NOT_INITIALIZED>;
using EglBadAccess = priv::ErrorStream<EGL_BAD_ACCESS>;
using EglBadAlloc = priv::ErrorStream<EGL_BAD_ALLOC>;
using EglBadAttribute = priv::ErrorStream<EGL_BAD_ATTRIBUTE>;
using EglBadConfig = priv::ErrorStream<EGL_BAD_CONFIG>;
using EglBadContext = priv::ErrorStream<EGL_BAD_CONTEXT>;
using EglBadCurrentSurface = priv::ErrorStream<EGL_BAD_CURRENT_SURFACE>;
using EglBadDisplay = priv::ErrorStream<EGL_BAD_DISPLAY>;
using EglBadMatch = priv::ErrorStream<EGL_BAD_MATCH>;
using EglBadNativeWindow = priv::ErrorStream<EGL_BAD_NATIVE_WINDOW>;
using EglBadParameter = priv::ErrorStream<EGL_BAD_PARAMETER>;
using EglBadSurface = priv::ErrorStream<EGL_BAD_SURFACE>;
using EglContextLost = priv::ErrorStream<EGL_CONTEXT_LOST>;
using EglBadStream = priv::ErrorStream<EGL_BAD_STREAM_KHR>;
using EglBadState = priv::ErrorStream<EGL_BAD_STATE_KHR>;
using EglBadDevice = priv::ErrorStream<EGL_BAD_DEVICE_EXT>;
inline Error NoError()
{
return Error(EGL_SUCCESS);
}
} // namespace egl
#define ANGLE_CONCAT1(x, y) x##y
#define ANGLE_CONCAT2(x, y) ANGLE_CONCAT1(x, y)
#define ANGLE_LOCAL_VAR ANGLE_CONCAT2(_localVar, __LINE__)
#define ANGLE_TRY_TEMPLATE(EXPR, FUNC) \
{ \
auto ANGLE_LOCAL_VAR = EXPR; \
if (ANGLE_LOCAL_VAR.isError()) \
{ \
FUNC(ANGLE_LOCAL_VAR); \
} \
} \
ANGLE_EMPTY_STATEMENT
#define ANGLE_RETURN(X) return X;
#define ANGLE_TRY(EXPR) ANGLE_TRY_TEMPLATE(EXPR, ANGLE_RETURN);
#define ANGLE_TRY_RESULT(EXPR, RESULT) \
{ \
auto ANGLE_LOCAL_VAR = EXPR; \
if (ANGLE_LOCAL_VAR.isError()) \
{ \
return ANGLE_LOCAL_VAR.getError(); \
} \
RESULT = ANGLE_LOCAL_VAR.getResult(); \
} \
ANGLE_EMPTY_STATEMENT
// TODO(jmadill): Introduce way to store errors to a const Context.
#define ANGLE_SWALLOW_ERR(EXPR) \
{ \
auto ANGLE_LOCAL_VAR = EXPR; \
if (ANGLE_LOCAL_VAR.isError()) \
{ \
ERR() << "Unhandled internal error: " << ANGLE_LOCAL_VAR; \
} \
} \
ANGLE_EMPTY_STATEMENT
#undef ANGLE_LOCAL_VAR
#undef ANGLE_CONCAT2
#undef ANGLE_CONCAT1
#include "Error.inl"
#endif // LIBANGLE_ERROR_H_