Hash :
4c1c7c08
Author :
Date :
2025-04-18T00:00:00
Include entry point names in error messages Moved entry point name injection to ErrorSet::validationError to ensure that error messages handled via GL_KHR_debug always contain the corresponding entry point names. Updated affected tests. Fixed: angleproject:412384507 Change-Id: I9e898cadca0634505d70b36dbbb00feedb6c10b2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6480177 Commit-Queue: Alexey Knyazev <lexa.knyazev@gmail.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Yuxin Hu <yuxinhu@google.com>
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
//
// Copyright 2015 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.
//
// Debug.h: Defines debug state used for GL_KHR_debug
#ifndef LIBANGLE_DEBUG_H_
#define LIBANGLE_DEBUG_H_
#include "angle_gl.h"
#include "common/PackedEnums.h"
#include "common/SimpleMutex.h"
#include "common/angleutils.h"
#include "libANGLE/AttributeMap.h"
#include "libANGLE/Error.h"
#include <atomic>
#include <deque>
#include <string>
#include <vector>
namespace gl
{
class Context;
class LabeledObject
{
public:
virtual ~LabeledObject() {}
virtual angle::Result setLabel(const Context *context, const std::string &label) = 0;
virtual const std::string &getLabel() const = 0;
};
class Debug : angle::NonCopyable
{
public:
Debug(bool initialDebugState);
~Debug();
void setMaxLoggedMessages(GLuint maxLoggedMessages);
void setOutputEnabled(bool enabled);
bool isOutputEnabled() const;
void setOutputSynchronous(bool synchronous);
bool isOutputSynchronous() const;
void setCallback(GLDEBUGPROCKHR callback, const void *userParam);
GLDEBUGPROCKHR getCallback() const;
const void *getUserParam() const;
void insertMessage(GLenum source,
GLenum type,
GLuint id,
GLenum severity,
const std::string &message,
gl::LogSeverity logSeverity) const;
void insertMessage(GLenum source,
GLenum type,
GLuint id,
GLenum severity,
std::string &&message,
gl::LogSeverity logSeverity) const;
void setMessageControl(GLenum source,
GLenum type,
GLenum severity,
std::vector<GLuint> &&ids,
bool enabled);
size_t getMessages(GLuint count,
GLsizei bufSize,
GLenum *sources,
GLenum *types,
GLuint *ids,
GLenum *severities,
GLsizei *lengths,
GLchar *messageLog);
size_t getNextMessageLength() const;
size_t getMessageCount() const;
void pushGroup(GLenum source, GLuint id, std::string &&message);
void popGroup();
size_t getGroupStackDepth() const;
// Helper for ANGLE_PERF_WARNING
void insertPerfWarning(GLenum severity, bool isLastRepeat, const char *message) const;
private:
bool isMessageEnabled(GLenum source, GLenum type, GLuint id, GLenum severity) const;
void pushDefaultGroup();
struct Message
{
GLenum source;
GLenum type;
GLuint id;
GLenum severity;
std::string message;
};
struct Control
{
Control();
~Control();
Control(const Control &other);
GLenum source;
GLenum type;
GLenum severity;
std::vector<GLuint> ids;
bool enabled;
};
struct Group
{
Group();
~Group();
Group(const Group &other);
GLenum source;
GLuint id;
std::string message;
std::vector<Control> controls;
};
bool mOutputEnabled;
mutable angle::SimpleMutex mMutex;
GLDEBUGPROCKHR mCallbackFunction;
const void *mCallbackUserParam;
mutable std::deque<Message> mMessages;
GLuint mMaxLoggedMessages;
bool mOutputSynchronous;
std::vector<Group> mGroups;
};
} // namespace gl
namespace egl
{
class LabeledObject
{
public:
virtual ~LabeledObject() {}
virtual void setLabel(EGLLabelKHR label) = 0;
virtual EGLLabelKHR getLabel() const = 0;
};
class Debug : angle::NonCopyable
{
public:
Debug();
void setCallback(EGLDEBUGPROCKHR callback, const AttributeMap &attribs);
EGLDEBUGPROCKHR getCallback() const;
bool isMessageTypeEnabled(MessageType type) const;
void insertMessage(EGLenum error,
const char *command,
MessageType messageType,
EGLLabelKHR threadLabel,
EGLLabelKHR objectLabel,
const std::string &message) const;
private:
EGLDEBUGPROCKHR mCallback;
angle::PackedEnumBitSet<MessageType> mEnabledMessageTypes;
};
} // namespace egl
namespace
{
ANGLE_INLINE bool PerfCounterBelowMaxRepeat(std::atomic<uint32_t> *counter, bool *isLastRepeat)
{
constexpr uint32_t kMaxPerfRepeat = 4;
// Stop incrementing the counter after max value to avoid unnecessary cache effects
if (counter->load(std::memory_order_relaxed) < kMaxPerfRepeat)
{
uint32_t count = counter->fetch_add(1, std::memory_order_relaxed);
// Check not strictly necessary as worst case is an additional log, but is good practice.
if (count < kMaxPerfRepeat)
{
if (count == kMaxPerfRepeat - 1)
{
*isLastRepeat = true;
}
return true;
}
}
return false;
}
} // namespace
// Generate a perf warning. Only outputs the same message a few times to avoid spamming the logs.
#define ANGLE_PERF_WARNING(debug, severity, ...) \
do \
{ \
static std::atomic<uint32_t> sRepeatCount = 0; \
bool isLastRepeat = false; \
if (PerfCounterBelowMaxRepeat(&sRepeatCount, &isLastRepeat)) \
{ \
char ANGLE_MESSAGE[200]; \
snprintf(ANGLE_MESSAGE, sizeof(ANGLE_MESSAGE), __VA_ARGS__); \
(debug).insertPerfWarning(severity, isLastRepeat, ANGLE_MESSAGE); \
} \
} while (0)
#endif // LIBANGLE_DEBUG_H_