Skip to content

A
angle
Commit 66988745 by Geoff Lang
Options

Revert "Implement GL_KHR_debug."

This reverts commit 6c521b7a. Change-Id: I6ff981198e31f34d3e405edea6277ee75516d6ee Reviewed-on: https://chromium-review.googlesource.com/319820Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 6c521b7a
Showing with 54 additions and 938 deletions
src/libANGLE/Buffer.cpp
...@@ -17,7 +17,6 @@ namespace gl ...@@ -17,7 +17,6 @@ namespace gl
Buffer::Buffer(rx::BufferImpl *impl, GLuint id) Buffer::Buffer(rx::BufferImpl *impl, GLuint id)
: RefCountObject(id), : RefCountObject(id),
mLabel(),
mBuffer(impl), mBuffer(impl),
mUsage(GL_STATIC_DRAW), mUsage(GL_STATIC_DRAW),
mSize(0), mSize(0),
...@@ -35,16 +34,6 @@ Buffer::~Buffer() ...@@ -35,16 +34,6 @@ Buffer::~Buffer()
SafeDelete(mBuffer); SafeDelete(mBuffer);
} }
void Buffer::setLabel(const std::string &label)
{
mLabel = label;
}
const std::string &Buffer::getLabel() const
{
return mLabel;
}
Error Buffer::bufferData(const void *data, GLsizeiptr size, GLenum usage) Error Buffer::bufferData(const void *data, GLsizeiptr size, GLenum usage)
{ {
gl::Error error = mBuffer->setData(data, size, usage); gl::Error error = mBuffer->setData(data, size, usage);
......
src/libANGLE/Buffer.h
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#define LIBANGLE_BUFFER_H_ #define LIBANGLE_BUFFER_H_
#include "common/angleutils.h" #include "common/angleutils.h"
#include "libANGLE/Debug.h"
#include "libANGLE/Error.h" #include "libANGLE/Error.h"
#include "libANGLE/IndexRangeCache.h" #include "libANGLE/IndexRangeCache.h"
#include "libANGLE/RefCountObject.h" #include "libANGLE/RefCountObject.h"
...@@ -25,14 +24,12 @@ class BufferImpl; ...@@ -25,14 +24,12 @@ class BufferImpl;
namespace gl namespace gl
{ {
class Buffer final : public RefCountObject, public LabeledObject class Buffer : public RefCountObject
{ {
public: public:
Buffer(rx::BufferImpl *impl, GLuint id); Buffer(rx::BufferImpl *impl, GLuint id);
virtual ~Buffer();
void setLabel(const std::string &label) override; virtual ~Buffer();
const std::string &getLabel() const override;
Error bufferData(const void *data, GLsizeiptr size, GLenum usage); Error bufferData(const void *data, GLsizeiptr size, GLenum usage);
Error bufferSubData(const void *data, GLsizeiptr size, GLintptr offset); Error bufferSubData(const void *data, GLsizeiptr size, GLintptr offset);
...@@ -64,8 +61,6 @@ class Buffer final : public RefCountObject, public LabeledObject ...@@ -64,8 +61,6 @@ class Buffer final : public RefCountObject, public LabeledObject
private: private:
rx::BufferImpl *mBuffer; rx::BufferImpl *mBuffer;
std::string mLabel;
GLenum mUsage; GLenum mUsage;
GLint64 mSize; GLint64 mSize;
GLbitfield mAccessFlags; GLbitfield mAccessFlags;
......
src/libANGLE/Caps.cpp
...@@ -148,10 +148,6 @@ Extensions::Extensions() ...@@ -148,10 +148,6 @@ Extensions::Extensions()
packSubimage(false), packSubimage(false),
vertexArrayObject(false), vertexArrayObject(false),
debug(false), debug(false),
maxDebugMessageLength(0),
maxDebugLoggedMessages(0),
maxDebugGroupStackDepth(0),
maxLabelLength(0),
colorBufferFloat(false) colorBufferFloat(false)
{ {
} }
......
src/libANGLE/Caps.h
...@@ -262,10 +262,6 @@ struct Extensions ...@@ -262,10 +262,6 @@ struct Extensions
// GL_KHR_debug // GL_KHR_debug
bool debug; bool debug;
GLuint maxDebugMessageLength;
GLuint maxDebugLoggedMessages;
GLuint maxDebugGroupStackDepth;
GLuint maxLabelLength;
// ES3 Extension support // ES3 Extension support
......
src/libANGLE/Context.cpp
...@@ -62,8 +62,7 @@ Context::Context(const egl::Config *config, ...@@ -62,8 +62,7 @@ Context::Context(const egl::Config *config,
const Context *shareContext, const Context *shareContext,
rx::Renderer *renderer, rx::Renderer *renderer,
bool notifyResets, bool notifyResets,
bool robustAccess, bool robustAccess)
bool debug)
: ValidationContext(clientVersion, : ValidationContext(clientVersion,
mState, mState,
mCaps, mCaps,
...@@ -78,7 +77,7 @@ Context::Context(const egl::Config *config, ...@@ -78,7 +77,7 @@ Context::Context(const egl::Config *config,
ASSERT(robustAccess == false); // Unimplemented ASSERT(robustAccess == false); // Unimplemented
initCaps(clientVersion); initCaps(clientVersion);
mState.initialize(mCaps, mExtensions, clientVersion, debug); mState.initialize(mCaps, clientVersion);
mClientVersion = clientVersion; mClientVersion = clientVersion;
...@@ -504,7 +503,7 @@ void Context::deleteQuery(GLuint query) ...@@ -504,7 +503,7 @@ void Context::deleteQuery(GLuint query)
} }
} }
Buffer *Context::getBuffer(GLuint handle) const Buffer *Context::getBuffer(GLuint handle)
{ {
return mResourceManager->getBuffer(handle); return mResourceManager->getBuffer(handle);
} }
...@@ -524,7 +523,7 @@ Texture *Context::getTexture(GLuint handle) const ...@@ -524,7 +523,7 @@ Texture *Context::getTexture(GLuint handle) const
return mResourceManager->getTexture(handle); return mResourceManager->getTexture(handle);
} }
Renderbuffer *Context::getRenderbuffer(GLuint handle) const Renderbuffer *Context::getRenderbuffer(GLuint handle)
{ {
return mResourceManager->getRenderbuffer(handle); return mResourceManager->getRenderbuffer(handle);
} }
...@@ -551,41 +550,6 @@ TransformFeedback *Context::getTransformFeedback(GLuint handle) const ...@@ -551,41 +550,6 @@ TransformFeedback *Context::getTransformFeedback(GLuint handle) const
return (iter != mTransformFeedbackMap.end()) ? iter->second : nullptr; return (iter != mTransformFeedbackMap.end()) ? iter->second : nullptr;
} }
LabeledObject *Context::getLabeledObject(GLenum identifier, GLuint name) const
{
switch (identifier)
{
case GL_BUFFER:
return getBuffer(name);
case GL_SHADER:
return getShader(name);
case GL_PROGRAM:
return getProgram(name);
case GL_VERTEX_ARRAY:
return getVertexArray(name);
case GL_QUERY:
return getQuery(name);
case GL_TRANSFORM_FEEDBACK:
return getTransformFeedback(name);
case GL_SAMPLER:
return getSampler(name);
case GL_TEXTURE:
return getTexture(name);
case GL_RENDERBUFFER:
return getRenderbuffer(name);
case GL_FRAMEBUFFER:
return getFramebuffer(name);
default:
UNREACHABLE();
return nullptr;
}
}
LabeledObject *Context::getLabeledObjectFromPtr(const void *ptr) const
{
return getFenceSync(reinterpret_cast<GLsync>(const_cast<void *>(ptr)));
}
bool Context::isSampler(GLuint samplerName) const bool Context::isSampler(GLuint samplerName) const
{ {
return mResourceManager->isSampler(samplerName); return mResourceManager->isSampler(samplerName);
...@@ -812,12 +776,6 @@ Query *Context::getQuery(unsigned int handle, bool create, GLenum type) ...@@ -812,12 +776,6 @@ Query *Context::getQuery(unsigned int handle, bool create, GLenum type)
} }
} }
Query *Context::getQuery(GLuint handle) const
{
auto iter = mQueryMap.find(handle);
return (iter != mQueryMap.end()) ? iter->second : nullptr;
}
Texture *Context::getTargetTexture(GLenum target) const Texture *Context::getTargetTexture(GLenum target) const
{ {
ASSERT(ValidTextureTarget(this, target)); ASSERT(ValidTextureTarget(this, target));
...@@ -947,21 +905,6 @@ void Context::getIntegerv(GLenum pname, GLint *params) ...@@ -947,21 +905,6 @@ void Context::getIntegerv(GLenum pname, GLint *params)
case GL_NUM_EXTENSIONS: case GL_NUM_EXTENSIONS:
*params = static_cast<GLint>(mExtensionStrings.size()); *params = static_cast<GLint>(mExtensionStrings.size());
break; break;
// GL_KHR_debug
case GL_MAX_DEBUG_MESSAGE_LENGTH:
*params = mExtensions.maxDebugMessageLength;
break;
case GL_MAX_DEBUG_LOGGED_MESSAGES:
*params = mExtensions.maxDebugLoggedMessages;
break;
case GL_MAX_DEBUG_GROUP_STACK_DEPTH:
*params = mExtensions.maxDebugGroupStackDepth;
break;
case GL_MAX_LABEL_LENGTH:
*params = mExtensions.maxLabelLength;
break;
default: default:
mState.getIntegerv(getData(), pname, params); mState.getIntegerv(getData(), pname, params);
break; break;
...@@ -995,11 +938,6 @@ void Context::getInteger64v(GLenum pname, GLint64 *params) ...@@ -995,11 +938,6 @@ void Context::getInteger64v(GLenum pname, GLint64 *params)
} }
} }
void Context::getPointerv(GLenum pname, void **params) const
{
mState.getPointerv(pname, params);
}
bool Context::getIndexedIntegerv(GLenum target, GLuint index, GLint *data) bool Context::getIndexedIntegerv(GLenum target, GLuint index, GLint *data)
{ {
// Queries about context capabilities and maximums are answered by Context. // Queries about context capabilities and maximums are answered by Context.
...@@ -1211,29 +1149,6 @@ bool Context::getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *nu ...@@ -1211,29 +1149,6 @@ bool Context::getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *nu
return true; return true;
} }
if (mExtensions.debug)
{
switch (pname)
{
case GL_DEBUG_LOGGED_MESSAGES:
case GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH:
case GL_DEBUG_GROUP_STACK_DEPTH:
case GL_MAX_DEBUG_MESSAGE_LENGTH:
case GL_MAX_DEBUG_LOGGED_MESSAGES:
case GL_MAX_DEBUG_GROUP_STACK_DEPTH:
case GL_MAX_LABEL_LENGTH:
*type = GL_INT;
*numParams = 1;
return true;
case GL_DEBUG_OUTPUT_SYNCHRONOUS:
case GL_DEBUG_OUTPUT:
*type = GL_BOOL;
*numParams = 1;
return true;
}
}
// Check for ES3.0+ parameter names which are also exposed as ES2 extensions // Check for ES3.0+ parameter names which are also exposed as ES2 extensions
switch (pname) switch (pname)
{ {
...@@ -1478,13 +1393,6 @@ void Context::recordError(const Error &error) ...@@ -1478,13 +1393,6 @@ void Context::recordError(const Error &error)
if (error.isError()) if (error.isError())
{ {
mErrors.insert(error.getCode()); mErrors.insert(error.getCode());
if (!error.getMessage().empty())
{
auto &debug = mState.getDebug();
debug.insertMessage(GL_DEBUG_SOURCE_API, GL_DEBUG_TYPE_ERROR, error.getID(),
GL_DEBUG_SEVERITY_HIGH, error.getMessage());
}
} }
} }
...@@ -1832,13 +1740,6 @@ void Context::initCaps(GLuint clientVersion) ...@@ -1832,13 +1740,6 @@ void Context::initCaps(GLuint clientVersion)
//mExtensions.sRGB = false; //mExtensions.sRGB = false;
} }
// Explicitly enable GL_KHR_debug
mExtensions.debug = true;
mExtensions.maxDebugMessageLength = 1024;
mExtensions.maxDebugLoggedMessages = 1024;
mExtensions.maxDebugGroupStackDepth = 1024;
mExtensions.maxLabelLength = 1024;
// Apply implementation limits // Apply implementation limits
mCaps.maxVertexAttributes = std::min<GLuint>(mCaps.maxVertexAttributes, MAX_VERTEX_ATTRIBS); mCaps.maxVertexAttributes = std::min<GLuint>(mCaps.maxVertexAttributes, MAX_VERTEX_ATTRIBS);
mCaps.maxVertexUniformBlocks = std::min<GLuint>(mCaps.maxVertexUniformBlocks, IMPLEMENTATION_MAX_VERTEX_SHADER_UNIFORM_BUFFERS); mCaps.maxVertexUniformBlocks = std::min<GLuint>(mCaps.maxVertexUniformBlocks, IMPLEMENTATION_MAX_VERTEX_SHADER_UNIFORM_BUFFERS);
......
src/libANGLE/Context.h
...@@ -58,13 +58,7 @@ class TransformFeedback; ...@@ -58,13 +58,7 @@ class TransformFeedback;
class Context final : public ValidationContext class Context final : public ValidationContext
{ {
public: public:
Context(const egl::Config *config, Context(const egl::Config *config, int clientVersion, const Context *shareContext, rx::Renderer *renderer, bool notifyResets, bool robustAccess);
int clientVersion,
const Context *shareContext,
rx::Renderer *renderer,
bool notifyResets,
bool robustAccess,
bool debug);
virtual ~Context(); virtual ~Context();
...@@ -139,21 +133,18 @@ class Context final : public ValidationContext ...@@ -139,21 +133,18 @@ class Context final : public ValidationContext
GLint getSamplerParameteri(GLuint sampler, GLenum pname); GLint getSamplerParameteri(GLuint sampler, GLenum pname);
GLfloat getSamplerParameterf(GLuint sampler, GLenum pname); GLfloat getSamplerParameterf(GLuint sampler, GLenum pname);
Buffer *getBuffer(GLuint handle) const; Buffer *getBuffer(GLuint handle);
FenceNV *getFenceNV(GLuint handle); FenceNV *getFenceNV(GLuint handle);
FenceSync *getFenceSync(GLsync handle) const; FenceSync *getFenceSync(GLsync handle) const;
Shader *getShader(GLuint handle) const; Shader *getShader(GLuint handle) const;
Program *getProgram(GLuint handle) const; Program *getProgram(GLuint handle) const;
Texture *getTexture(GLuint handle) const; Texture *getTexture(GLuint handle) const;
Framebuffer *getFramebuffer(GLuint handle) const; Framebuffer *getFramebuffer(GLuint handle) const;
Renderbuffer *getRenderbuffer(GLuint handle) const; Renderbuffer *getRenderbuffer(GLuint handle);
VertexArray *getVertexArray(GLuint handle) const; VertexArray *getVertexArray(GLuint handle) const;
Sampler *getSampler(GLuint handle) const; Sampler *getSampler(GLuint handle) const;
Query *getQuery(GLuint handle, bool create, GLenum type); Query *getQuery(GLuint handle, bool create, GLenum type);
Query *getQuery(GLuint handle) const;
TransformFeedback *getTransformFeedback(GLuint handle) const; TransformFeedback *getTransformFeedback(GLuint handle) const;
LabeledObject *getLabeledObject(GLenum identifier, GLuint name) const;
LabeledObject *getLabeledObjectFromPtr(const void *ptr) const;
Texture *getTargetTexture(GLenum target) const; Texture *getTargetTexture(GLenum target) const;
Texture *getSamplerTexture(unsigned int sampler, GLenum type) const; Texture *getSamplerTexture(unsigned int sampler, GLenum type) const;
...@@ -169,7 +160,6 @@ class Context final : public ValidationContext ...@@ -169,7 +160,6 @@ class Context final : public ValidationContext
void getFloatv(GLenum pname, GLfloat *params); void getFloatv(GLenum pname, GLfloat *params);
void getIntegerv(GLenum pname, GLint *params); void getIntegerv(GLenum pname, GLint *params);
void getInteger64v(GLenum pname, GLint64 *params); void getInteger64v(GLenum pname, GLint64 *params);
void getPointerv(GLenum pname, void **params) const;
bool getIndexedIntegerv(GLenum target, GLuint index, GLint *data); bool getIndexedIntegerv(GLenum target, GLuint index, GLint *data);
bool getIndexedInteger64v(GLenum target, GLuint index, GLint64 *data); bool getIndexedInteger64v(GLenum target, GLuint index, GLint64 *data);
......
src/libANGLE/Debug.cpp deleted 100644 → 0
//
// Copyright (c) 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.cpp: Defines debug state used for GL_KHR_debug
#include "libANGLE/Debug.h"
#include "common/debug.h"
#include <algorithm>
#include <tuple>
namespace gl
{
Debug::Debug()
: mOutputEnabled(false),
mCallbackFunction(nullptr),
mCallbackUserParam(nullptr),
mMessages(),
mMaxLoggedMessages(0),
mOutputSynchronous(false),
mGroups()
{
pushDefaultGroup();
}
void Debug::setMaxLoggedMessages(GLuint maxLoggedMessages)
{
mMaxLoggedMessages = maxLoggedMessages;
}
void Debug::setOutputEnabled(bool enabled)
{
mOutputEnabled = enabled;
}
bool Debug::isOutputEnabled() const
{
return mOutputEnabled;
}
void Debug::setOutputSynchronous(bool synchronous)
{
mOutputSynchronous = synchronous;
}
bool Debug::isOutputSynchronous() const
{
return mOutputSynchronous;
}
void Debug::setCallback(GLDEBUGPROCKHR callback, const void *userParam)
{
mCallbackFunction = callback;
mCallbackUserParam = userParam;
}
GLDEBUGPROCKHR Debug::getCallback() const
{
return mCallbackFunction;
}
const void *Debug::getUserParam() const
{
return mCallbackUserParam;
}
void Debug::insertMessage(GLenum source,
GLenum type,
GLuint id,
GLenum severity,
const std::string &message)
{
std::string messageCopy(message);
insertMessage(source, type, id, severity, std::move(messageCopy));
}
void Debug::insertMessage(GLenum source,
GLenum type,
GLuint id,
GLenum severity,
std::string &&message)
{
if (!isMessageEnabled(source, type, id, severity))
{
return;
}
if (mCallbackFunction != nullptr)
{
// TODO(geofflang) Check the synchronous flag and potentially flush messages from another
// thread.
mCallbackFunction(source, type, id, severity, static_cast<GLsizei>(message.length()),
message.c_str(), mCallbackUserParam);
}
else
{
if (mMessages.size() >= mMaxLoggedMessages)
{
// Drop messages over the limit
return;
}
Message m;
m.source = source;
m.type = type;
m.id = id;
m.severity = severity;
m.message = std::move(message);
mMessages.push_back(std::move(m));
}
}
size_t Debug::getMessages(GLuint count,
GLsizei bufSize,
GLenum *sources,
GLenum *types,
GLuint *ids,
GLenum *severities,
GLsizei *lengths,
GLchar *messageLog)
{
size_t messageCount = 0;
size_t messageStringIndex = 0;
while (messageCount <= count && !mMessages.empty())
{
const Message &m = mMessages.front();
if (messageLog != nullptr)
{
// Check that this message can fit in the message buffer
if (messageStringIndex + m.message.length() + 1 > static_cast<size_t>(bufSize))
{
break;
}
std::copy(m.message.begin(), m.message.end(), messageLog + messageStringIndex);
messageStringIndex += m.message.length();
messageLog[messageStringIndex] = '\0';
messageStringIndex += 1;
}
if (sources != nullptr)
{
sources[messageCount] = m.source;
}
if (types != nullptr)
{
types[messageCount] = m.type;
}
if (ids != nullptr)
{
ids[messageCount] = m.id;
}
if (severities != nullptr)
{
severities[messageCount] = m.severity;
}
if (lengths != nullptr)
{
lengths[messageCount] = static_cast<GLsizei>(m.message.length());
}
mMessages.pop_front();
messageCount++;
}
return messageCount;
}
size_t Debug::getNextMessageLength() const
{
return mMessages.empty() ? 0 : mMessages.front().message.length();
}
size_t Debug::getMessageCount() const
{
return mMessages.size();
}
void Debug::setMessageControl(GLenum source,
GLenum type,
GLenum severity,
std::vector<GLuint> &&ids,
bool enabled)
{
Control c;
c.source = source;
c.type = type;
c.severity = severity;
c.ids = std::move(ids);
c.enabled = enabled;
auto &controls = mGroups.back().controls;
controls.push_back(std::move(c));
}
void Debug::pushGroup(GLenum source, GLuint id, std::string &&message)
{
insertMessage(source, GL_DEBUG_TYPE_PUSH_GROUP, id, GL_DEBUG_SEVERITY_NOTIFICATION,
std::string(message));
Group g;
g.source = source;
g.id = id;
g.message = std::move(message);
mGroups.push_back(std::move(g));
}
void Debug::popGroup()
{
// Make sure the default group is not about to be popped
ASSERT(mGroups.size() > 1);
Group g = mGroups.back();
mGroups.pop_back();
insertMessage(g.source, GL_DEBUG_TYPE_POP_GROUP, g.id, GL_DEBUG_SEVERITY_NOTIFICATION,
g.message);
}
size_t Debug::getGroupStackDepth() const
{
return mGroups.size();
}
bool Debug::isMessageEnabled(GLenum source, GLenum type, GLuint id, GLenum severity) const
{
if (!mOutputEnabled)
{
return false;
}
for (auto groupIter = mGroups.rbegin(); groupIter != mGroups.rend(); groupIter++)
{
const auto &controls = groupIter->controls;
for (auto controlIter = controls.rbegin(); controlIter != controls.rend(); controlIter++)
{
const auto &control = *controlIter;
if (control.source != GL_DONT_CARE && control.source != source)
{
continue;
}
if (control.type != GL_DONT_CARE && control.type != type)
{
continue;
}
if (control.severity != GL_DONT_CARE && control.severity != severity)
{
continue;
}
if (!control.ids.empty() &&
std::find(control.ids.begin(), control.ids.end(), id) == control.ids.end())
{
continue;
}
return control.enabled;
}
}
return true;
}
void Debug::pushDefaultGroup()
{
Group g;
g.source = GL_NONE;
g.id = 0;
g.message = "";
Control c0;
c0.source = GL_DONT_CARE;
c0.type = GL_DONT_CARE;
c0.severity = GL_DONT_CARE;
c0.enabled = true;
g.controls.push_back(std::move(c0));
Control c1;
c1.source = GL_DONT_CARE;
c1.type = GL_DONT_CARE;
c1.severity = GL_DEBUG_SEVERITY_LOW;
c1.enabled = false;
g.controls.push_back(std::move(c1));
mGroups.push_back(std::move(g));
}
} // namespace gl
src/libANGLE/Debug.h deleted 100644 → 0
//
// Copyright (c) 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/angleutils.h"
#include <deque>
#include <string>
#include <vector>
namespace gl
{
class LabeledObject
{
public:
virtual void setLabel(const std::string &label) = 0;
virtual const std::string &getLabel() const = 0;
};
class Debug : angle::NonCopyable
{
public:
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);
void insertMessage(GLenum source,
GLenum type,
GLuint id,
GLenum severity,
std::string &&message);
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;
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
{
GLenum source;
GLenum type;
GLenum severity;
std::vector<GLuint> ids;
bool enabled;
};
struct Group
{
GLenum source;
GLuint id;
std::string message;
std::vector<Control> controls;
};
bool mOutputEnabled;
GLDEBUGPROCKHR mCallbackFunction;
const void *mCallbackUserParam;
std::deque<Message> mMessages;
GLuint mMaxLoggedMessages;
bool mOutputSynchronous;
std::vector<Group> mGroups;
};
} // namespace gl
#endif // LIBANGLE_DEBUG_H_
src/libANGLE/Error.cpp
...@@ -17,17 +17,8 @@ namespace gl ...@@ -17,17 +17,8 @@ namespace gl
{ {
Error::Error(GLenum errorCode, const char *msg, ...) Error::Error(GLenum errorCode, const char *msg, ...)
: mCode(errorCode), mID(errorCode), mMessage(nullptr) : mCode(errorCode),
{ mMessage(nullptr)
va_list vararg;
va_start(vararg, msg);
createMessageString();
*mMessage = FormatString(msg, vararg);
va_end(vararg);
}
Error::Error(GLenum errorCode, GLuint id, const char *msg, ...)
: mCode(errorCode), mID(id), mMessage(nullptr)
{ {
va_list vararg; va_list vararg;
va_start(vararg, msg); va_start(vararg, msg);
......
src/libANGLE/Error.h
...@@ -22,7 +22,6 @@ class Error final ...@@ -22,7 +22,6 @@ class Error final
public: public:
explicit inline Error(GLenum errorCode); explicit inline Error(GLenum errorCode);
Error(GLenum errorCode, const char *msg, ...); Error(GLenum errorCode, const char *msg, ...);
Error(GLenum errorCode, GLuint id, const char *msg, ...);
inline Error(const Error &other); inline Error(const Error &other);
inline Error(Error &&other); inline Error(Error &&other);
...@@ -32,7 +31,6 @@ class Error final ...@@ -32,7 +31,6 @@ class Error final
inline Error &operator=(Error &&other); inline Error &operator=(Error &&other);
inline GLenum getCode() const; inline GLenum getCode() const;
inline GLuint getID() const;
inline bool isError() const; inline bool isError() const;
const std::string &getMessage() const; const std::string &getMessage() const;
...@@ -45,7 +43,6 @@ class Error final ...@@ -45,7 +43,6 @@ class Error final
void createMessageString() const; void createMessageString() const;
GLenum mCode; GLenum mCode;
GLuint mID;
mutable std::string *mMessage; mutable std::string *mMessage;
}; };
......
src/libANGLE/Error.inl
...@@ -15,14 +15,12 @@ namespace gl ...@@ -15,14 +15,12 @@ namespace gl
Error::Error(GLenum errorCode) Error::Error(GLenum errorCode)
: mCode(errorCode), : mCode(errorCode),
mID(errorCode),
mMessage(nullptr) mMessage(nullptr)
{ {
} }
Error::Error(const Error &other) Error::Error(const Error &other)
: mCode(other.mCode), : mCode(other.mCode),
mID(other.mID),
mMessage(nullptr) mMessage(nullptr)
{ {
if (other.mMessage != nullptr) if (other.mMessage != nullptr)
...@@ -34,7 +32,6 @@ Error::Error(const Error &other) ...@@ -34,7 +32,6 @@ Error::Error(const Error &other)
Error::Error(Error &&other) Error::Error(Error &&other)
: mCode(other.mCode), : mCode(other.mCode),
mID(other.mID),
mMessage(other.mMessage) mMessage(other.mMessage)
{ {
other.mMessage = nullptr; other.mMessage = nullptr;
...@@ -48,7 +45,6 @@ Error::~Error() ...@@ -48,7 +45,6 @@ Error::~Error()
Error &Error::operator=(const Error &other) Error &Error::operator=(const Error &other)
{ {
mCode = other.mCode; mCode = other.mCode;
mID = other.mID;
if (other.mMessage != nullptr) if (other.mMessage != nullptr)
{ {
...@@ -66,7 +62,6 @@ Error &Error::operator=(const Error &other) ...@@ -66,7 +62,6 @@ Error &Error::operator=(const Error &other)
Error &Error::operator=(Error &&other) Error &Error::operator=(Error &&other)
{ {
mCode = other.mCode; mCode = other.mCode;
mID = other.mID;
mMessage = other.mMessage; mMessage = other.mMessage;
other.mMessage = nullptr; other.mMessage = nullptr;
...@@ -79,11 +74,6 @@ GLenum Error::getCode() const ...@@ -79,11 +74,6 @@ GLenum Error::getCode() const
return mCode; return mCode;
} }
GLuint Error::getID() const
{
return mID;
}
bool Error::isError() const bool Error::isError() const
{ {
return (mCode != GL_NO_ERROR); return (mCode != GL_NO_ERROR);
......
src/libANGLE/Fence.cpp
...@@ -76,7 +76,10 @@ Error FenceNV::finish() ...@@ -76,7 +76,10 @@ Error FenceNV::finish()
} }
FenceSync::FenceSync(rx::FenceSyncImpl *impl, GLuint id) FenceSync::FenceSync(rx::FenceSyncImpl *impl, GLuint id)
: RefCountObject(id), mFence(impl), mLabel(), mCondition(GL_NONE), mFlags(0) : RefCountObject(id),
mFence(impl),
mCondition(GL_NONE),
mFlags(0)
{ {
} }
...@@ -85,16 +88,6 @@ FenceSync::~FenceSync() ...@@ -85,16 +88,6 @@ FenceSync::~FenceSync()
SafeDelete(mFence); SafeDelete(mFence);
} }
void FenceSync::setLabel(const std::string &label)
{
mLabel = label;
}
const std::string &FenceSync::getLabel() const
{
return mLabel;
}
Error FenceSync::set(GLenum condition, GLbitfield flags) Error FenceSync::set(GLenum condition, GLbitfield flags)
{ {
Error error = mFence->set(condition, flags); Error error = mFence->set(condition, flags);
......
src/libANGLE/Fence.h
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#ifndef LIBANGLE_FENCE_H_ #ifndef LIBANGLE_FENCE_H_
#define LIBANGLE_FENCE_H_ #define LIBANGLE_FENCE_H_
#include "libANGLE/Debug.h"
#include "libANGLE/Error.h" #include "libANGLE/Error.h"
#include "libANGLE/RefCountObject.h" #include "libANGLE/RefCountObject.h"
...@@ -48,15 +47,12 @@ class FenceNV final : angle::NonCopyable ...@@ -48,15 +47,12 @@ class FenceNV final : angle::NonCopyable
GLenum mCondition; GLenum mCondition;
}; };
class FenceSync final : public RefCountObject, public LabeledObject class FenceSync final : public RefCountObject
{ {
public: public:
FenceSync(rx::FenceSyncImpl *impl, GLuint id); explicit FenceSync(rx::FenceSyncImpl *impl, GLuint id);
virtual ~FenceSync(); virtual ~FenceSync();
void setLabel(const std::string &label) override;
const std::string &getLabel() const override;
Error set(GLenum condition, GLbitfield flags); Error set(GLenum condition, GLbitfield flags);
Error clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResult); Error clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResult);
Error serverWait(GLbitfield flags, GLuint64 timeout); Error serverWait(GLbitfield flags, GLuint64 timeout);
...@@ -68,8 +64,6 @@ class FenceSync final : public RefCountObject, public LabeledObject ...@@ -68,8 +64,6 @@ class FenceSync final : public RefCountObject, public LabeledObject
private: private:
rx::FenceSyncImpl *mFence; rx::FenceSyncImpl *mFence;
std::string mLabel;
GLenum mCondition; GLenum mCondition;
GLbitfield mFlags; GLbitfield mFlags;
}; };
......
src/libANGLE/Framebuffer.cpp
...@@ -40,8 +40,7 @@ void DetachMatchingAttachment(FramebufferAttachment *attachment, GLenum matchTyp ...@@ -40,8 +40,7 @@ void DetachMatchingAttachment(FramebufferAttachment *attachment, GLenum matchTyp
} }
Framebuffer::Data::Data() Framebuffer::Data::Data()
: mLabel(), : mColorAttachments(1),
mColorAttachments(1),
mDrawBufferStates(1, GL_NONE), mDrawBufferStates(1, GL_NONE),
mReadBufferState(GL_COLOR_ATTACHMENT0_EXT) mReadBufferState(GL_COLOR_ATTACHMENT0_EXT)
{ {
...@@ -49,8 +48,7 @@ Framebuffer::Data::Data() ...@@ -49,8 +48,7 @@ Framebuffer::Data::Data()
} }
Framebuffer::Data::Data(const Caps &caps) Framebuffer::Data::Data(const Caps &caps)
: mLabel(), : mColorAttachments(caps.maxColorAttachments),
mColorAttachments(caps.maxColorAttachments),
mDrawBufferStates(caps.maxDrawBuffers, GL_NONE), mDrawBufferStates(caps.maxDrawBuffers, GL_NONE),
mReadBufferState(GL_COLOR_ATTACHMENT0_EXT) mReadBufferState(GL_COLOR_ATTACHMENT0_EXT)
{ {
...@@ -61,11 +59,6 @@ Framebuffer::Data::~Data() ...@@ -61,11 +59,6 @@ Framebuffer::Data::~Data()
{ {
} }
const std::string &Framebuffer::Data::getLabel()
{
return mLabel;
}
const FramebufferAttachment *Framebuffer::Data::getReadAttachment() const const FramebufferAttachment *Framebuffer::Data::getReadAttachment() const
{ {
ASSERT(mReadBufferState == GL_BACK || (mReadBufferState >= GL_COLOR_ATTACHMENT0 && mReadBufferState <= GL_COLOR_ATTACHMENT15)); ASSERT(mReadBufferState == GL_BACK || (mReadBufferState >= GL_COLOR_ATTACHMENT0 && mReadBufferState <= GL_COLOR_ATTACHMENT15));
...@@ -186,16 +179,6 @@ Framebuffer::~Framebuffer() ...@@ -186,16 +179,6 @@ Framebuffer::~Framebuffer()
SafeDelete(mImpl); SafeDelete(mImpl);
} }
void Framebuffer::setLabel(const std::string &label)
{
mData.mLabel = label;
}
const std::string &Framebuffer::getLabel() const
{
return mData.mLabel;
}
void Framebuffer::detachTexture(GLuint textureId) void Framebuffer::detachTexture(GLuint textureId)
{ {
detachResourceById(GL_TEXTURE, textureId); detachResourceById(GL_TEXTURE, textureId);
......
src/libANGLE/Framebuffer.h
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include "common/angleutils.h" #include "common/angleutils.h"
#include "libANGLE/Constants.h" #include "libANGLE/Constants.h"
#include "libANGLE/Debug.h"
#include "libANGLE/Error.h" #include "libANGLE/Error.h"
#include "libANGLE/FramebufferAttachment.h" #include "libANGLE/FramebufferAttachment.h"
#include "libANGLE/RefCountObject.h" #include "libANGLE/RefCountObject.h"
...@@ -45,7 +44,7 @@ struct Extensions; ...@@ -45,7 +44,7 @@ struct Extensions;
struct ImageIndex; struct ImageIndex;
struct Rectangle; struct Rectangle;
class Framebuffer final : public LabeledObject class Framebuffer
{ {
public: public:
...@@ -56,8 +55,6 @@ class Framebuffer final : public LabeledObject ...@@ -56,8 +55,6 @@ class Framebuffer final : public LabeledObject
explicit Data(const Caps &caps); explicit Data(const Caps &caps);
~Data(); ~Data();
const std::string &getLabel();
const FramebufferAttachment *getReadAttachment() const; const FramebufferAttachment *getReadAttachment() const;
const FramebufferAttachment *getFirstColorAttachment() const; const FramebufferAttachment *getFirstColorAttachment() const;
const FramebufferAttachment *getDepthOrStencilAttachment() const; const FramebufferAttachment *getDepthOrStencilAttachment() const;
...@@ -74,8 +71,6 @@ class Framebuffer final : public LabeledObject ...@@ -74,8 +71,6 @@ class Framebuffer final : public LabeledObject
private: private:
friend class Framebuffer; friend class Framebuffer;
std::string mLabel;
std::vector<FramebufferAttachment> mColorAttachments; std::vector<FramebufferAttachment> mColorAttachments;
FramebufferAttachment mDepthAttachment; FramebufferAttachment mDepthAttachment;
FramebufferAttachment mStencilAttachment; FramebufferAttachment mStencilAttachment;
...@@ -88,9 +83,6 @@ class Framebuffer final : public LabeledObject ...@@ -88,9 +83,6 @@ class Framebuffer final : public LabeledObject
Framebuffer(rx::SurfaceImpl *surface); Framebuffer(rx::SurfaceImpl *surface);
virtual ~Framebuffer(); virtual ~Framebuffer();
void setLabel(const std::string &label) override;
const std::string &getLabel() const override;
const rx::FramebufferImpl *getImplementation() const { return mImpl; } const rx::FramebufferImpl *getImplementation() const { return mImpl; }
rx::FramebufferImpl *getImplementation() { return mImpl; } rx::FramebufferImpl *getImplementation() { return mImpl; }
......
src/libANGLE/Program.cpp
...@@ -223,8 +223,7 @@ VariableLocation::VariableLocation(const std::string &name, unsigned int element ...@@ -223,8 +223,7 @@ VariableLocation::VariableLocation(const std::string &name, unsigned int element
} }
Program::Data::Data() Program::Data::Data()
: mLabel(), : mAttachedFragmentShader(nullptr),
mAttachedFragmentShader(nullptr),
mAttachedVertexShader(nullptr), mAttachedVertexShader(nullptr),
mTransformFeedbackBufferMode(GL_INTERLEAVED_ATTRIBS), mTransformFeedbackBufferMode(GL_INTERLEAVED_ATTRIBS),
mBinaryRetrieveableHint(false) mBinaryRetrieveableHint(false)
...@@ -244,11 +243,6 @@ Program::Data::~Data() ...@@ -244,11 +243,6 @@ Program::Data::~Data()
} }
} }
const std::string &Program::Data::getLabel()
{
return mLabel;
}
const LinkedUniform *Program::Data::getUniformByName(const std::string &name) const const LinkedUniform *Program::Data::getUniformByName(const std::string &name) const
{ {
for (const LinkedUniform &linkedUniform : mUniforms) for (const LinkedUniform &linkedUniform : mUniforms)
...@@ -334,16 +328,6 @@ Program::~Program() ...@@ -334,16 +328,6 @@ Program::~Program()
SafeDelete(mProgram); SafeDelete(mProgram);
} }
void Program::setLabel(const std::string &label)
{
mData.mLabel = label;
}
const std::string &Program::getLabel() const
{
return mData.mLabel;
}
bool Program::attachShader(Shader *shader) bool Program::attachShader(Shader *shader)
{ {
if (shader->getType() == GL_VERTEX_SHADER) if (shader->getType() == GL_VERTEX_SHADER)
......
src/libANGLE/Program.h
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include "libANGLE/angletypes.h" #include "libANGLE/angletypes.h"
#include "libANGLE/Constants.h" #include "libANGLE/Constants.h"
#include "libANGLE/Debug.h"
#include "libANGLE/Error.h" #include "libANGLE/Error.h"
#include "libANGLE/RefCountObject.h" #include "libANGLE/RefCountObject.h"
...@@ -144,7 +143,7 @@ struct VariableLocation ...@@ -144,7 +143,7 @@ struct VariableLocation
unsigned int index; unsigned int index;
}; };
class Program final : angle::NonCopyable, public LabeledObject class Program : angle::NonCopyable
{ {
public: public:
class Data final : angle::NonCopyable class Data final : angle::NonCopyable
...@@ -153,8 +152,6 @@ class Program final : angle::NonCopyable, public LabeledObject ...@@ -153,8 +152,6 @@ class Program final : angle::NonCopyable, public LabeledObject
Data(); Data();
~Data(); ~Data();
const std::string &getLabel();
const Shader *getAttachedVertexShader() const { return mAttachedVertexShader; } const Shader *getAttachedVertexShader() const { return mAttachedVertexShader; }
const Shader *getAttachedFragmentShader() const { return mAttachedFragmentShader; } const Shader *getAttachedFragmentShader() const { return mAttachedFragmentShader; }
const std::vector<std::string> &getTransformFeedbackVaryingNames() const const std::vector<std::string> &getTransformFeedbackVaryingNames() const
...@@ -194,8 +191,6 @@ class Program final : angle::NonCopyable, public LabeledObject ...@@ -194,8 +191,6 @@ class Program final : angle::NonCopyable, public LabeledObject
private: private:
friend class Program; friend class Program;
std::string mLabel;
Shader *mAttachedFragmentShader; Shader *mAttachedFragmentShader;
Shader *mAttachedVertexShader; Shader *mAttachedVertexShader;
...@@ -229,9 +224,6 @@ class Program final : angle::NonCopyable, public LabeledObject ...@@ -229,9 +224,6 @@ class Program final : angle::NonCopyable, public LabeledObject
GLuint id() const { return mHandle; } GLuint id() const { return mHandle; }
void setLabel(const std::string &label) override;
const std::string &getLabel() const override;
rx::ProgramImpl *getImplementation() { return mProgram; } rx::ProgramImpl *getImplementation() { return mProgram; }
const rx::ProgramImpl *getImplementation() const { return mProgram; } const rx::ProgramImpl *getImplementation() const { return mProgram; }
......
src/libANGLE/Query.cpp
...@@ -11,7 +11,9 @@ ...@@ -11,7 +11,9 @@
namespace gl namespace gl
{ {
Query::Query(rx::QueryImpl *impl, GLuint id) : RefCountObject(id), mQuery(impl), mLabel() Query::Query(rx::QueryImpl *impl, GLuint id)
: RefCountObject(id),
mQuery(impl)
{ {
} }
...@@ -20,16 +22,6 @@ Query::~Query() ...@@ -20,16 +22,6 @@ Query::~Query()
SafeDelete(mQuery); SafeDelete(mQuery);
} }
void Query::setLabel(const std::string &label)
{
mLabel = label;
}
const std::string &Query::getLabel() const
{
return mLabel;
}
Error Query::begin() Error Query::begin()
{ {
return mQuery->begin(); return mQuery->begin();
......
src/libANGLE/Query.h
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#ifndef LIBANGLE_QUERY_H_ #ifndef LIBANGLE_QUERY_H_
#define LIBANGLE_QUERY_H_ #define LIBANGLE_QUERY_H_
#include "libANGLE/Debug.h"
#include "libANGLE/Error.h" #include "libANGLE/Error.h"
#include "libANGLE/RefCountObject.h" #include "libANGLE/RefCountObject.h"
...@@ -25,15 +24,12 @@ class QueryImpl; ...@@ -25,15 +24,12 @@ class QueryImpl;
namespace gl namespace gl
{ {
class Query final : public RefCountObject, public LabeledObject class Query : public RefCountObject
{ {
public: public:
Query(rx::QueryImpl *impl, GLuint id); Query(rx::QueryImpl *impl, GLuint id);
virtual ~Query(); virtual ~Query();
void setLabel(const std::string &label) override;
const std::string &getLabel() const override;
Error begin(); Error begin();
Error end(); Error end();
...@@ -47,8 +43,6 @@ class Query final : public RefCountObject, public LabeledObject ...@@ -47,8 +43,6 @@ class Query final : public RefCountObject, public LabeledObject
private: private:
rx::QueryImpl *mQuery; rx::QueryImpl *mQuery;
std::string mLabel;
}; };
} }
......
src/libANGLE/Renderbuffer.cpp
...@@ -22,7 +22,6 @@ namespace gl ...@@ -22,7 +22,6 @@ namespace gl
Renderbuffer::Renderbuffer(rx::RenderbufferImpl *impl, GLuint id) Renderbuffer::Renderbuffer(rx::RenderbufferImpl *impl, GLuint id)
: egl::ImageSibling(id), : egl::ImageSibling(id),
mRenderbuffer(impl), mRenderbuffer(impl),
mLabel(),
mWidth(0), mWidth(0),
mHeight(0), mHeight(0),
mInternalFormat(GL_RGBA4), mInternalFormat(GL_RGBA4),
...@@ -35,16 +34,6 @@ Renderbuffer::~Renderbuffer() ...@@ -35,16 +34,6 @@ Renderbuffer::~Renderbuffer()
SafeDelete(mRenderbuffer); SafeDelete(mRenderbuffer);
} }
void Renderbuffer::setLabel(const std::string &label)
{
mLabel = label;
}
const std::string &Renderbuffer::getLabel() const
{
return mLabel;
}
Error Renderbuffer::setStorage(GLenum internalformat, size_t width, size_t height) Error Renderbuffer::setStorage(GLenum internalformat, size_t width, size_t height)
{ {
orphanImages(); orphanImages();
......
src/libANGLE/Renderbuffer.h
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include "angle_gl.h" #include "angle_gl.h"
#include "common/angleutils.h" #include "common/angleutils.h"
#include "libANGLE/Debug.h"
#include "libANGLE/Error.h" #include "libANGLE/Error.h"
#include "libANGLE/FramebufferAttachment.h" #include "libANGLE/FramebufferAttachment.h"
#include "libANGLE/Image.h" #include "libANGLE/Image.h"
...@@ -26,17 +25,12 @@ namespace gl ...@@ -26,17 +25,12 @@ namespace gl
// FramebufferAttachment and Framebuffer for how they are applied to an FBO via an // FramebufferAttachment and Framebuffer for how they are applied to an FBO via an
// attachment point. // attachment point.
class Renderbuffer final : public egl::ImageSibling, class Renderbuffer : public egl::ImageSibling, public gl::FramebufferAttachmentObject
public gl::FramebufferAttachmentObject,
public LabeledObject
{ {
public: public:
Renderbuffer(rx::RenderbufferImpl *impl, GLuint id); Renderbuffer(rx::RenderbufferImpl *impl, GLuint id);
virtual ~Renderbuffer(); virtual ~Renderbuffer();
void setLabel(const std::string &label) override;
const std::string &getLabel() const override;
Error setStorage(GLenum internalformat, size_t width, size_t height); Error setStorage(GLenum internalformat, size_t width, size_t height);
Error setStorageMultisample(size_t samples, GLenum internalformat, size_t width, size_t height); Error setStorageMultisample(size_t samples, GLenum internalformat, size_t width, size_t height);
Error setStorageEGLImageTarget(egl::Image *imageTarget); Error setStorageEGLImageTarget(egl::Image *imageTarget);
...@@ -69,8 +63,6 @@ class Renderbuffer final : public egl::ImageSibling, ...@@ -69,8 +63,6 @@ class Renderbuffer final : public egl::ImageSibling,
rx::RenderbufferImpl *mRenderbuffer; rx::RenderbufferImpl *mRenderbuffer;
std::string mLabel;
GLsizei mWidth; GLsizei mWidth;
GLsizei mHeight; GLsizei mHeight;
GLenum mInternalFormat; GLenum mInternalFormat;
......
src/libANGLE/Sampler.cpp
...@@ -16,7 +16,7 @@ namespace gl ...@@ -16,7 +16,7 @@ namespace gl
{ {
Sampler::Sampler(rx::ImplFactory *factory, GLuint id) Sampler::Sampler(rx::ImplFactory *factory, GLuint id)
: RefCountObject(id), mImpl(factory->createSampler()), mLabel(), mSamplerState() : RefCountObject(id), mImpl(factory->createSampler()), mSamplerState()
{ {
} }
...@@ -25,16 +25,6 @@ Sampler::~Sampler() ...@@ -25,16 +25,6 @@ Sampler::~Sampler()
SafeDelete(mImpl); SafeDelete(mImpl);
} }
void Sampler::setLabel(const std::string &label)
{
mLabel = label;
}
const std::string &Sampler::getLabel() const
{
return mLabel;
}
void Sampler::setMinFilter(GLenum minFilter) void Sampler::setMinFilter(GLenum minFilter)
{ {
mSamplerState.minFilter = minFilter; mSamplerState.minFilter = minFilter;
......
src/libANGLE/Sampler.h
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#define LIBANGLE_SAMPLER_H_ #define LIBANGLE_SAMPLER_H_
#include "libANGLE/angletypes.h" #include "libANGLE/angletypes.h"
#include "libANGLE/Debug.h"
#include "libANGLE/RefCountObject.h" #include "libANGLE/RefCountObject.h"
namespace rx namespace rx
...@@ -23,15 +22,12 @@ class SamplerImpl; ...@@ -23,15 +22,12 @@ class SamplerImpl;
namespace gl namespace gl
{ {
class Sampler final : public RefCountObject, public LabeledObject class Sampler final : public RefCountObject
{ {
public: public:
Sampler(rx::ImplFactory *factory, GLuint id); Sampler(rx::ImplFactory *factory, GLuint id);
~Sampler() override; ~Sampler() override;
void setLabel(const std::string &label) override;
const std::string &getLabel() const override;
void setMinFilter(GLenum minFilter); void setMinFilter(GLenum minFilter);
GLenum getMinFilter() const; GLenum getMinFilter() const;
...@@ -70,8 +66,6 @@ class Sampler final : public RefCountObject, public LabeledObject ...@@ -70,8 +66,6 @@ class Sampler final : public RefCountObject, public LabeledObject
private: private:
rx::SamplerImpl *mImpl; rx::SamplerImpl *mImpl;
std::string mLabel;
SamplerState mSamplerState; SamplerState mSamplerState;
}; };
......
src/libANGLE/Shader.cpp
...@@ -72,7 +72,7 @@ bool CompareShaderVar(const sh::ShaderVariable &x, const sh::ShaderVariable &y) ...@@ -72,7 +72,7 @@ bool CompareShaderVar(const sh::ShaderVariable &x, const sh::ShaderVariable &y)
return gl::VariableSortOrder(x.type) < gl::VariableSortOrder(y.type); return gl::VariableSortOrder(x.type) < gl::VariableSortOrder(y.type);
} }
Shader::Data::Data(GLenum shaderType) : mLabel(), mShaderType(shaderType), mShaderVersion(100) Shader::Data::Data(GLenum shaderType) : mShaderType(shaderType), mShaderVersion(100)
{ {
} }
...@@ -103,16 +103,6 @@ Shader::~Shader() ...@@ -103,16 +103,6 @@ Shader::~Shader()
SafeDelete(mImplementation); SafeDelete(mImplementation);
} }
void Shader::setLabel(const std::string &label)
{
mData.mLabel = label;
}
const std::string &Shader::getLabel() const
{
return mData.mLabel;
}
GLuint Shader::getHandle() const GLuint Shader::getHandle() const
{ {
return mHandle; return mHandle;
......
src/libANGLE/Shader.h
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "common/angleutils.h" #include "common/angleutils.h"
#include "libANGLE/angletypes.h" #include "libANGLE/angletypes.h"
#include "libANGLE/Debug.h"
namespace rx namespace rx
{ {
...@@ -37,7 +36,7 @@ struct Limitations; ...@@ -37,7 +36,7 @@ struct Limitations;
class ResourceManager; class ResourceManager;
struct Data; struct Data;
class Shader final : angle::NonCopyable, public LabeledObject class Shader : angle::NonCopyable
{ {
public: public:
class Data final : angle::NonCopyable class Data final : angle::NonCopyable
...@@ -46,8 +45,6 @@ class Shader final : angle::NonCopyable, public LabeledObject ...@@ -46,8 +45,6 @@ class Shader final : angle::NonCopyable, public LabeledObject
Data(GLenum shaderType); Data(GLenum shaderType);
~Data(); ~Data();
const std::string &getLabel() const { return mLabel; }
const std::string &getSource() const { return mSource; } const std::string &getSource() const { return mSource; }
const std::string &getTranslatedSource() const { return mTranslatedSource; } const std::string &getTranslatedSource() const { return mTranslatedSource; }
...@@ -69,8 +66,6 @@ class Shader final : angle::NonCopyable, public LabeledObject ...@@ -69,8 +66,6 @@ class Shader final : angle::NonCopyable, public LabeledObject
private: private:
friend class Shader; friend class Shader;
std::string mLabel;
GLenum mShaderType; GLenum mShaderType;
int mShaderVersion; int mShaderVersion;
std::string mTranslatedSource; std::string mTranslatedSource;
...@@ -91,9 +86,6 @@ class Shader final : angle::NonCopyable, public LabeledObject ...@@ -91,9 +86,6 @@ class Shader final : angle::NonCopyable, public LabeledObject
virtual ~Shader(); virtual ~Shader();
void setLabel(const std::string &label) override;
const std::string &getLabel() const override;
GLenum getType() const { return mType; } GLenum getType() const { return mType; }
GLuint getHandle() const; GLuint getHandle() const;
......
src/libANGLE/State.cpp
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "libANGLE/Context.h" #include "libANGLE/Context.h"
#include "libANGLE/Caps.h" #include "libANGLE/Caps.h"
#include "libANGLE/Debug.h"
#include "libANGLE/Framebuffer.h" #include "libANGLE/Framebuffer.h"
#include "libANGLE/FramebufferAttachment.h" #include "libANGLE/FramebufferAttachment.h"
#include "libANGLE/Query.h" #include "libANGLE/Query.h"
...@@ -79,10 +78,7 @@ State::~State() ...@@ -79,10 +78,7 @@ State::~State()
reset(); reset();
} }
void State::initialize(const Caps &caps, void State::initialize(const Caps &caps, GLuint clientVersion)
const Extensions &extensions,
GLuint clientVersion,
bool debug)
{ {
mMaxDrawBuffers = caps.maxDrawBuffers; mMaxDrawBuffers = caps.maxDrawBuffers;
mMaxCombinedTextureImageUnits = caps.maxCombinedTextureImageUnits; mMaxCombinedTextureImageUnits = caps.maxCombinedTextureImageUnits;
...@@ -189,9 +185,6 @@ void State::initialize(const Caps &caps, ...@@ -189,9 +185,6 @@ void State::initialize(const Caps &caps,
mDrawFramebuffer = NULL; mDrawFramebuffer = NULL;
mPrimitiveRestart = false; mPrimitiveRestart = false;
mDebug.setOutputEnabled(debug);
mDebug.setMaxLoggedMessages(extensions.maxDebugLoggedMessages);
} }
void State::reset() void State::reset()
...@@ -588,12 +581,6 @@ void State::setEnableFeature(GLenum feature, bool enabled) ...@@ -588,12 +581,6 @@ void State::setEnableFeature(GLenum feature, bool enabled)
case GL_DITHER: setDither(enabled); break; case GL_DITHER: setDither(enabled); break;
case GL_PRIMITIVE_RESTART_FIXED_INDEX: setPrimitiveRestart(enabled); break; case GL_PRIMITIVE_RESTART_FIXED_INDEX: setPrimitiveRestart(enabled); break;
case GL_RASTERIZER_DISCARD: setRasterizerDiscard(enabled); break; case GL_RASTERIZER_DISCARD: setRasterizerDiscard(enabled); break;
case GL_DEBUG_OUTPUT_SYNCHRONOUS:
mDebug.setOutputSynchronous(enabled);
break;
case GL_DEBUG_OUTPUT:
mDebug.setOutputEnabled(enabled);
break;
default: UNREACHABLE(); default: UNREACHABLE();
} }
} }
...@@ -613,10 +600,6 @@ bool State::getEnableFeature(GLenum feature) ...@@ -613,10 +600,6 @@ bool State::getEnableFeature(GLenum feature)
case GL_DITHER: return isDitherEnabled(); case GL_DITHER: return isDitherEnabled();
case GL_PRIMITIVE_RESTART_FIXED_INDEX: return isPrimitiveRestartEnabled(); case GL_PRIMITIVE_RESTART_FIXED_INDEX: return isPrimitiveRestartEnabled();
case GL_RASTERIZER_DISCARD: return isRasterizerDiscardEnabled(); case GL_RASTERIZER_DISCARD: return isRasterizerDiscardEnabled();
case GL_DEBUG_OUTPUT_SYNCHRONOUS:
return mDebug.isOutputSynchronous();
case GL_DEBUG_OUTPUT:
return mDebug.isOutputEnabled();
default: UNREACHABLE(); return false; default: UNREACHABLE(); return false;
} }
} }
...@@ -1288,16 +1271,6 @@ PixelUnpackState &State::getUnpackState() ...@@ -1288,16 +1271,6 @@ PixelUnpackState &State::getUnpackState()
return mUnpack; return mUnpack;
} }
const Debug &State::getDebug() const
{
return mDebug;
}
Debug &State::getDebug()
{
return mDebug;
}
void State::getBooleanv(GLenum pname, GLboolean *params) void State::getBooleanv(GLenum pname, GLboolean *params)
{ {
switch (pname) switch (pname)
...@@ -1327,12 +1300,6 @@ void State::getBooleanv(GLenum pname, GLboolean *params) ...@@ -1327,12 +1300,6 @@ void State::getBooleanv(GLenum pname, GLboolean *params)
case GL_RASTERIZER_DISCARD: case GL_RASTERIZER_DISCARD:
*params = isRasterizerDiscardEnabled() ? GL_TRUE : GL_FALSE; *params = isRasterizerDiscardEnabled() ? GL_TRUE : GL_FALSE;
break; break;
case GL_DEBUG_OUTPUT_SYNCHRONOUS:
*params = mDebug.isOutputSynchronous() ? GL_TRUE : GL_FALSE;
break;
case GL_DEBUG_OUTPUT:
*params = mDebug.isOutputEnabled() ? GL_TRUE : GL_FALSE;
break;
default: default:
UNREACHABLE(); UNREACHABLE();
break; break;
...@@ -1590,37 +1557,12 @@ void State::getIntegerv(const gl::Data &data, GLenum pname, GLint *params) ...@@ -1590,37 +1557,12 @@ void State::getIntegerv(const gl::Data &data, GLenum pname, GLint *params)
case GL_PIXEL_UNPACK_BUFFER_BINDING: case GL_PIXEL_UNPACK_BUFFER_BINDING:
*params = mUnpack.pixelBuffer.id(); *params = mUnpack.pixelBuffer.id();
break; break;
case GL_DEBUG_LOGGED_MESSAGES:
*params = static_cast<GLint>(mDebug.getMessageCount());
break;
case GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH:
*params = static_cast<GLint>(mDebug.getNextMessageLength());
break;
case GL_DEBUG_GROUP_STACK_DEPTH:
*params = static_cast<GLint>(mDebug.getGroupStackDepth());
break;
default: default:
UNREACHABLE(); UNREACHABLE();
break; break;
} }
} }
void State::getPointerv(GLenum pname, void **params) const
{
switch (pname)
{
case GL_DEBUG_CALLBACK_FUNCTION:
*params = reinterpret_cast<void *>(mDebug.getCallback());
break;
case GL_DEBUG_CALLBACK_USER_PARAM:
*params = const_cast<void *>(mDebug.getUserParam());
break;
default:
UNREACHABLE();
break;
}
}
bool State::getIndexedIntegerv(GLenum target, GLuint index, GLint *data) bool State::getIndexedIntegerv(GLenum target, GLuint index, GLint *data)
{ {
switch (target) switch (target)
......
src/libANGLE/State.h
...@@ -10,10 +10,8 @@ ...@@ -10,10 +10,8 @@
#define LIBANGLE_STATE_H_ #define LIBANGLE_STATE_H_
#include <bitset> #include <bitset>
#include <memory>
#include "common/angleutils.h" #include "common/angleutils.h"
#include "libANGLE/Debug.h"
#include "libANGLE/Program.h" #include "libANGLE/Program.h"
#include "libANGLE/RefCountObject.h" #include "libANGLE/RefCountObject.h"
#include "libANGLE/Renderbuffer.h" #include "libANGLE/Renderbuffer.h"
...@@ -39,10 +37,7 @@ class State : angle::NonCopyable ...@@ -39,10 +37,7 @@ class State : angle::NonCopyable
State(); State();
~State(); ~State();
void initialize(const Caps &caps, void initialize(const Caps& caps, GLuint clientVersion);
const Extensions &extensions,
GLuint clientVersion,
bool debug);
void reset(); void reset();
// State chunk getters // State chunk getters
...@@ -263,15 +258,10 @@ class State : angle::NonCopyable ...@@ -263,15 +258,10 @@ class State : angle::NonCopyable
const PixelUnpackState &getUnpackState() const; const PixelUnpackState &getUnpackState() const;
PixelUnpackState &getUnpackState(); PixelUnpackState &getUnpackState();
// Debug state
const Debug &getDebug() const;
Debug &getDebug();
// State query functions // State query functions
void getBooleanv(GLenum pname, GLboolean *params); void getBooleanv(GLenum pname, GLboolean *params);
void getFloatv(GLenum pname, GLfloat *params); void getFloatv(GLenum pname, GLfloat *params);
void getIntegerv(const gl::Data &data, GLenum pname, GLint *params); void getIntegerv(const gl::Data &data, GLenum pname, GLint *params);
void getPointerv(GLenum pname, void **params) const;
bool getIndexedIntegerv(GLenum target, GLuint index, GLint *data); bool getIndexedIntegerv(GLenum target, GLuint index, GLint *data);
bool getIndexedInteger64v(GLenum target, GLuint index, GLint64 *data); bool getIndexedInteger64v(GLenum target, GLuint index, GLint64 *data);
...@@ -422,8 +412,6 @@ class State : angle::NonCopyable ...@@ -422,8 +412,6 @@ class State : angle::NonCopyable
bool mPrimitiveRestart; bool mPrimitiveRestart;
Debug mDebug;
DirtyBits mDirtyBits; DirtyBits mDirtyBits;
DirtyBits mUnpackStateBitMask; DirtyBits mUnpackStateBitMask;
DirtyBits mPackStateBitMask; DirtyBits mPackStateBitMask;
......
src/libANGLE/Texture.cpp
...@@ -50,7 +50,6 @@ static size_t GetImageDescIndex(GLenum target, size_t level) ...@@ -50,7 +50,6 @@ static size_t GetImageDescIndex(GLenum target, size_t level)
Texture::Texture(rx::TextureImpl *impl, GLuint id, GLenum target) Texture::Texture(rx::TextureImpl *impl, GLuint id, GLenum target)
: egl::ImageSibling(id), : egl::ImageSibling(id),
mTexture(impl), mTexture(impl),
mLabel(),
mTextureState(), mTextureState(),
mTarget(target), mTarget(target),
mImageDescs(IMPLEMENTATION_MAX_TEXTURE_LEVELS * (target == GL_TEXTURE_CUBE_MAP ? 6 : 1)), mImageDescs(IMPLEMENTATION_MAX_TEXTURE_LEVELS * (target == GL_TEXTURE_CUBE_MAP ? 6 : 1)),
...@@ -69,16 +68,6 @@ Texture::~Texture() ...@@ -69,16 +68,6 @@ Texture::~Texture()
SafeDelete(mTexture); SafeDelete(mTexture);
} }
void Texture::setLabel(const std::string &label)
{
mLabel = label;
}
const std::string &Texture::getLabel() const
{
return mLabel;
}
GLenum Texture::getTarget() const GLenum Texture::getTarget() const
{ {
return mTarget; return mTarget;
......
src/libANGLE/Texture.h
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include "angle_gl.h" #include "angle_gl.h"
#include "common/debug.h" #include "common/debug.h"
#include "libANGLE/Caps.h" #include "libANGLE/Caps.h"
#include "libANGLE/Debug.h"
#include "libANGLE/Constants.h" #include "libANGLE/Constants.h"
#include "libANGLE/Error.h" #include "libANGLE/Error.h"
#include "libANGLE/FramebufferAttachment.h" #include "libANGLE/FramebufferAttachment.h"
...@@ -34,19 +33,14 @@ class Context; ...@@ -34,19 +33,14 @@ class Context;
class Framebuffer; class Framebuffer;
struct Data; struct Data;
bool IsMipmapFiltered(const SamplerState &samplerState); bool IsMipmapFiltered(const gl::SamplerState &samplerState);
class Texture final : public egl::ImageSibling, class Texture final : public egl::ImageSibling, public gl::FramebufferAttachmentObject
public FramebufferAttachmentObject,
public LabeledObject
{ {
public: public:
Texture(rx::TextureImpl *impl, GLuint id, GLenum target); Texture(rx::TextureImpl *impl, GLuint id, GLenum target);
~Texture() override; ~Texture() override;
void setLabel(const std::string &label) override;
const std::string &getLabel() const override;
GLenum getTarget() const; GLenum getTarget() const;
void setSwizzleRed(GLenum swizzleRed); void setSwizzleRed(GLenum swizzleRed);
...@@ -190,8 +184,6 @@ class Texture final : public egl::ImageSibling, ...@@ -190,8 +184,6 @@ class Texture final : public egl::ImageSibling,
rx::TextureImpl *mTexture; rx::TextureImpl *mTexture;
std::string mLabel;
TextureState mTextureState; TextureState mTextureState;
GLenum mTarget; GLenum mTarget;
......
src/libANGLE/TransformFeedback.cpp
...@@ -13,10 +13,9 @@ ...@@ -13,10 +13,9 @@
namespace gl namespace gl
{ {
TransformFeedback::TransformFeedback(rx::TransformFeedbackImpl *impl, GLuint id, const Caps &caps) TransformFeedback::TransformFeedback(rx::TransformFeedbackImpl* impl, GLuint id, const Caps &caps)
: RefCountObject(id), : RefCountObject(id),
mImplementation(impl), mImplementation(impl),
mLabel(),
mActive(false), mActive(false),
mPrimitiveMode(GL_NONE), mPrimitiveMode(GL_NONE),
mPaused(false), mPaused(false),
...@@ -37,16 +36,6 @@ TransformFeedback::~TransformFeedback() ...@@ -37,16 +36,6 @@ TransformFeedback::~TransformFeedback()
SafeDelete(mImplementation); SafeDelete(mImplementation);
} }
void TransformFeedback::setLabel(const std::string &label)
{
mLabel = label;
}
const std::string &TransformFeedback::getLabel() const
{
return mLabel;
}
void TransformFeedback::begin(GLenum primitiveMode) void TransformFeedback::begin(GLenum primitiveMode)
{ {
mActive = true; mActive = true;
......
src/libANGLE/TransformFeedback.h
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "libANGLE/RefCountObject.h" #include "libANGLE/RefCountObject.h"
#include "common/angleutils.h" #include "common/angleutils.h"
#include "libANGLE/Debug.h"
#include "angle_gl.h" #include "angle_gl.h"
...@@ -24,15 +23,12 @@ namespace gl ...@@ -24,15 +23,12 @@ namespace gl
class Buffer; class Buffer;
struct Caps; struct Caps;
class TransformFeedback final : public RefCountObject, public LabeledObject class TransformFeedback : public RefCountObject
{ {
public: public:
TransformFeedback(rx::TransformFeedbackImpl* impl, GLuint id, const Caps &caps); TransformFeedback(rx::TransformFeedbackImpl* impl, GLuint id, const Caps &caps);
virtual ~TransformFeedback(); virtual ~TransformFeedback();
void setLabel(const std::string &label) override;
const std::string &getLabel() const override;
void begin(GLenum primitiveMode); void begin(GLenum primitiveMode);
void end(); void end();
void pause(); void pause();
...@@ -57,8 +53,6 @@ class TransformFeedback final : public RefCountObject, public LabeledObject ...@@ -57,8 +53,6 @@ class TransformFeedback final : public RefCountObject, public LabeledObject
private: private:
rx::TransformFeedbackImpl* mImplementation; rx::TransformFeedbackImpl* mImplementation;
std::string mLabel;
bool mActive; bool mActive;
GLenum mPrimitiveMode; GLenum mPrimitiveMode;
bool mPaused; bool mPaused;
......
src/libANGLE/VertexArray.cpp
...@@ -15,7 +15,8 @@ namespace gl ...@@ -15,7 +15,8 @@ namespace gl
{ {
VertexArray::Data::Data(size_t maxAttribs) VertexArray::Data::Data(size_t maxAttribs)
: mLabel(), mVertexAttributes(maxAttribs), mMaxEnabledAttribute(0) : mVertexAttributes(maxAttribs),
mMaxEnabledAttribute(0)
{ {
} }
...@@ -45,16 +46,6 @@ GLuint VertexArray::id() const ...@@ -45,16 +46,6 @@ GLuint VertexArray::id() const
return mId; return mId;
} }
void VertexArray::setLabel(const std::string &label)
{
mData.mLabel = label;
}
const std::string &VertexArray::getLabel() const
{
return mData.mLabel;
}
void VertexArray::detachBuffer(GLuint bufferName) void VertexArray::detachBuffer(GLuint bufferName)
{ {
for (size_t attribute = 0; attribute < getMaxAttribs(); attribute++) for (size_t attribute = 0; attribute < getMaxAttribs(); attribute++)
......
src/libANGLE/VertexArray.h
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include "libANGLE/RefCountObject.h" #include "libANGLE/RefCountObject.h"
#include "libANGLE/Constants.h" #include "libANGLE/Constants.h"
#include "libANGLE/Debug.h"
#include "libANGLE/State.h" #include "libANGLE/State.h"
#include "libANGLE/VertexAttribute.h" #include "libANGLE/VertexAttribute.h"
...@@ -31,7 +30,7 @@ namespace gl ...@@ -31,7 +30,7 @@ namespace gl
{ {
class Buffer; class Buffer;
class VertexArray final : public LabeledObject class VertexArray
{ {
public: public:
VertexArray(rx::ImplFactory *factory, GLuint id, size_t maxAttribs); VertexArray(rx::ImplFactory *factory, GLuint id, size_t maxAttribs);
...@@ -39,9 +38,6 @@ class VertexArray final : public LabeledObject ...@@ -39,9 +38,6 @@ class VertexArray final : public LabeledObject
GLuint id() const; GLuint id() const;
void setLabel(const std::string &label) override;
const std::string &getLabel() const override;
const VertexAttribute &getVertexAttribute(size_t attributeIndex) const; const VertexAttribute &getVertexAttribute(size_t attributeIndex) const;
void detachBuffer(GLuint bufferName); void detachBuffer(GLuint bufferName);
...@@ -67,8 +63,6 @@ class VertexArray final : public LabeledObject ...@@ -67,8 +63,6 @@ class VertexArray final : public LabeledObject
explicit Data(size_t maxAttribs); explicit Data(size_t maxAttribs);
~Data(); ~Data();
const std::string &getLabel() const { return mLabel; }
const BindingPointer<Buffer> &getElementArrayBuffer() const { return mElementArrayBuffer; } const BindingPointer<Buffer> &getElementArrayBuffer() const { return mElementArrayBuffer; }
size_t getMaxAttribs() const { return mVertexAttributes.size(); } size_t getMaxAttribs() const { return mVertexAttributes.size(); }
size_t getMaxEnabledAttribute() const { return mMaxEnabledAttribute; } size_t getMaxEnabledAttribute() const { return mMaxEnabledAttribute; }
...@@ -80,7 +74,6 @@ class VertexArray final : public LabeledObject ...@@ -80,7 +74,6 @@ class VertexArray final : public LabeledObject
private: private:
friend class VertexArray; friend class VertexArray;
std::string mLabel;
std::vector<VertexAttribute> mVertexAttributes; std::vector<VertexAttribute> mVertexAttributes;
BindingPointer<Buffer> mElementArrayBuffer; BindingPointer<Buffer> mElementArrayBuffer;
size_t mMaxEnabledAttribute; size_t mMaxEnabledAttribute;
......
src/libANGLE/renderer/d3d/DisplayD3D.cpp
...@@ -235,10 +235,8 @@ egl::Error DisplayD3D::createContext(const egl::Config *config, const gl::Contex ...@@ -235,10 +235,8 @@ egl::Error DisplayD3D::createContext(const egl::Config *config, const gl::Contex
EGLint clientVersion = attribs.get(EGL_CONTEXT_CLIENT_VERSION, 1); EGLint clientVersion = attribs.get(EGL_CONTEXT_CLIENT_VERSION, 1);
bool notifyResets = (attribs.get(EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT, EGL_NO_RESET_NOTIFICATION_EXT) == EGL_LOSE_CONTEXT_ON_RESET_EXT); bool notifyResets = (attribs.get(EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT, EGL_NO_RESET_NOTIFICATION_EXT) == EGL_LOSE_CONTEXT_ON_RESET_EXT);
bool robustAccess = (attribs.get(EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT, EGL_FALSE) == EGL_TRUE); bool robustAccess = (attribs.get(EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT, EGL_FALSE) == EGL_TRUE);
bool debug = (attribs.get(EGL_CONTEXT_OPENGL_DEBUG, EGL_FALSE) == EGL_TRUE);
*outContext = new gl::Context(config, clientVersion, shareContext, mRenderer, notifyResets, *outContext = new gl::Context(config, clientVersion, shareContext, mRenderer, notifyResets, robustAccess);
robustAccess, debug);
return egl::Error(EGL_SUCCESS); return egl::Error(EGL_SUCCESS);
} }
......
src/libANGLE/renderer/gl/DisplayGL.cpp
...@@ -62,10 +62,8 @@ egl::Error DisplayGL::createContext(const egl::Config *config, const gl::Context ...@@ -62,10 +62,8 @@ egl::Error DisplayGL::createContext(const egl::Config *config, const gl::Context
EGLint clientVersion = attribs.get(EGL_CONTEXT_CLIENT_VERSION, 1); EGLint clientVersion = attribs.get(EGL_CONTEXT_CLIENT_VERSION, 1);
bool notifyResets = (attribs.get(EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT, EGL_NO_RESET_NOTIFICATION_EXT) == EGL_LOSE_CONTEXT_ON_RESET_EXT); bool notifyResets = (attribs.get(EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT, EGL_NO_RESET_NOTIFICATION_EXT) == EGL_LOSE_CONTEXT_ON_RESET_EXT);
bool robustAccess = (attribs.get(EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT, EGL_FALSE) == EGL_TRUE); bool robustAccess = (attribs.get(EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT, EGL_FALSE) == EGL_TRUE);
bool debug = (attribs.get(EGL_CONTEXT_OPENGL_DEBUG, EGL_FALSE) == EGL_TRUE);
*outContext = new gl::Context(config, clientVersion, shareContext, mRenderer, notifyResets, *outContext = new gl::Context(config, clientVersion, shareContext, mRenderer, notifyResets, robustAccess);
robustAccess, debug);
return egl::Error(EGL_SUCCESS); return egl::Error(EGL_SUCCESS);
} }
......
src/libANGLE/validationEGL.cpp
...@@ -210,9 +210,6 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context ...@@ -210,9 +210,6 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context
contextFlags = value; contextFlags = value;
break; break;
case EGL_CONTEXT_OPENGL_DEBUG:
break;
case EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR: case EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR:
// Only valid for OpenGL (non-ES) contexts // Only valid for OpenGL (non-ES) contexts
return Error(EGL_BAD_ATTRIBUTE); return Error(EGL_BAD_ATTRIBUTE);
......
src/libANGLE/validationES.cpp
...@@ -109,15 +109,9 @@ bool ValidCap(const Context *context, GLenum cap) ...@@ -109,15 +109,9 @@ bool ValidCap(const Context *context, GLenum cap)
case GL_BLEND: case GL_BLEND:
case GL_DITHER: case GL_DITHER:
return true; return true;
case GL_PRIMITIVE_RESTART_FIXED_INDEX: case GL_PRIMITIVE_RESTART_FIXED_INDEX:
case GL_RASTERIZER_DISCARD: case GL_RASTERIZER_DISCARD:
return (context->getClientVersion() >= 3); return (context->getClientVersion() >= 3);
case GL_DEBUG_OUTPUT_SYNCHRONOUS:
case GL_DEBUG_OUTPUT:
return context->getExtensions().debug;
default: default:
return false; return false;
} }
......
src/libANGLE/validationES_unittest.cpp
...@@ -96,7 +96,7 @@ TEST(ValidationESTest, DrawElementsWithMaxIndexGivesError) ...@@ -96,7 +96,7 @@ TEST(ValidationESTest, DrawElementsWithMaxIndexGivesError)
caps.maxElementIndex = 100; caps.maxElementIndex = 100;
caps.maxDrawBuffers = 1; caps.maxDrawBuffers = 1;
caps.maxColorAttachments = 1; caps.maxColorAttachments = 1;
state.initialize(caps, extensions, 3, false); state.initialize(caps, 3);
MockTextureImpl *textureImpl = new MockTextureImpl(); MockTextureImpl *textureImpl = new MockTextureImpl();
EXPECT_CALL(*textureImpl, setStorage(_, _, _, _)).WillOnce(Return(Error(GL_NO_ERROR))); EXPECT_CALL(*textureImpl, setStorage(_, _, _, _)).WillOnce(Return(Error(GL_NO_ERROR)));
......
src/libGLESv2.gypi
...@@ -68,8 +68,6 @@ ...@@ -68,8 +68,6 @@
'libANGLE/Context.h', 'libANGLE/Context.h',
'libANGLE/Data.cpp', 'libANGLE/Data.cpp',
'libANGLE/Data.h', 'libANGLE/Data.h',
'libANGLE/Debug.cpp',
'libANGLE/Debug.h',
'libANGLE/Device.cpp', 'libANGLE/Device.cpp',
'libANGLE/Device.h', 'libANGLE/Device.h',
'libANGLE/Display.cpp', 'libANGLE/Display.cpp',
......
src/libGLESv2/entry_points_gles_2_0_ext.cpp
...@@ -1298,9 +1298,7 @@ void GL_APIENTRY DebugMessageControlKHR(GLenum source, ...@@ -1298,9 +1298,7 @@ void GL_APIENTRY DebugMessageControlKHR(GLenum source,
return; return;
} }
std::vector<GLuint> idVector(ids, ids + count); UNIMPLEMENTED();
context->getState().getDebug().setMessageControl(
source, type, severity, std::move(idVector), (enabled != GL_FALSE));
} }
} }
...@@ -1324,8 +1322,7 @@ void GL_APIENTRY DebugMessageInsertKHR(GLenum source, ...@@ -1324,8 +1322,7 @@ void GL_APIENTRY DebugMessageInsertKHR(GLenum source,
return; return;
} }
std::string msg(buf, (length > 0) ? static_cast<size_t>(length) : strlen(buf)); UNIMPLEMENTED();
context->getState().getDebug().insertMessage(source, type, id, severity, std::move(msg));
} }
} }
...@@ -1342,7 +1339,7 @@ void GL_APIENTRY DebugMessageCallbackKHR(GLDEBUGPROCKHR callback, const void *us ...@@ -1342,7 +1339,7 @@ void GL_APIENTRY DebugMessageCallbackKHR(GLDEBUGPROCKHR callback, const void *us
return; return;
} }
context->getState().getDebug().setCallback(callback, userParam); UNIMPLEMENTED();
} }
} }
...@@ -1370,8 +1367,7 @@ GLuint GL_APIENTRY GetDebugMessageLogKHR(GLuint count, ...@@ -1370,8 +1367,7 @@ GLuint GL_APIENTRY GetDebugMessageLogKHR(GLuint count,
return 0; return 0;
} }
return static_cast<GLuint>(context->getState().getDebug().getMessages( UNIMPLEMENTED();
count, bufSize, sources, types, ids, severities, lengths, messageLog));
} }
return 0; return 0;
...@@ -1392,8 +1388,7 @@ void GL_APIENTRY PushDebugGroupKHR(GLenum source, GLuint id, GLsizei length, con ...@@ -1392,8 +1388,7 @@ void GL_APIENTRY PushDebugGroupKHR(GLenum source, GLuint id, GLsizei length, con
return; return;
} }
std::string msg(message, (length > 0) ? static_cast<size_t>(length) : strlen(message)); UNIMPLEMENTED();
context->getState().getDebug().pushGroup(source, id, std::move(msg));
} }
} }
...@@ -1409,7 +1404,7 @@ void GL_APIENTRY PopDebugGroupKHR(void) ...@@ -1409,7 +1404,7 @@ void GL_APIENTRY PopDebugGroupKHR(void)
return; return;
} }
context->getState().getDebug().popGroup(); UNIMPLEMENTED();
} }
} }
...@@ -1428,11 +1423,7 @@ void GL_APIENTRY ObjectLabelKHR(GLenum identifier, GLuint name, GLsizei length, ...@@ -1428,11 +1423,7 @@ void GL_APIENTRY ObjectLabelKHR(GLenum identifier, GLuint name, GLsizei length,
return; return;
} }
LabeledObject *object = context->getLabeledObject(identifier, name); UNIMPLEMENTED();
ASSERT(object != nullptr);
std::string lbl(label, (length > 0) ? static_cast<size_t>(length) : strlen(label));
object->setLabel(lbl);
} }
} }
...@@ -1452,14 +1443,7 @@ GetObjectLabelKHR(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *leng ...@@ -1452,14 +1443,7 @@ GetObjectLabelKHR(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *leng
return; return;
} }
LabeledObject *object = context->getLabeledObject(identifier, name); UNIMPLEMENTED();
ASSERT(object != nullptr);
const std::string &objectLabel = object->getLabel();
size_t writeLength = std::min(static_cast<size_t>(bufSize) - 1, objectLabel.length());
std::copy(objectLabel.begin(), objectLabel.begin() + writeLength, label);
label[writeLength] = '\0';
*length = static_cast<GLsizei>(writeLength);
} }
} }
...@@ -1476,11 +1460,7 @@ void GL_APIENTRY ObjectPtrLabelKHR(const void *ptr, GLsizei length, const GLchar ...@@ -1476,11 +1460,7 @@ void GL_APIENTRY ObjectPtrLabelKHR(const void *ptr, GLsizei length, const GLchar
return; return;
} }
LabeledObject *object = context->getLabeledObjectFromPtr(ptr); UNIMPLEMENTED();
ASSERT(object != nullptr);
std::string lbl(label, (length > 0) ? static_cast<size_t>(length) : strlen(label));
object->setLabel(lbl);
} }
} }
...@@ -1502,14 +1482,7 @@ void GL_APIENTRY GetObjectPtrLabelKHR(const void *ptr, ...@@ -1502,14 +1482,7 @@ void GL_APIENTRY GetObjectPtrLabelKHR(const void *ptr,
return; return;
} }
LabeledObject *object = context->getLabeledObjectFromPtr(ptr); UNIMPLEMENTED();
ASSERT(object != nullptr);
const std::string &objectLabel = object->getLabel();
size_t writeLength = std::min(static_cast<size_t>(bufSize) - 1, objectLabel.length());
std::copy(objectLabel.begin(), objectLabel.begin() + writeLength, label);
label[writeLength] = '\0';
*length = static_cast<GLsizei>(writeLength);
} }
} }
...@@ -1525,7 +1498,7 @@ void GL_APIENTRY GetPointervKHR(GLenum pname, void **params) ...@@ -1525,7 +1498,7 @@ void GL_APIENTRY GetPointervKHR(GLenum pname, void **params)
return; return;
} }
context->getPointerv(pname, params); UNIMPLEMENTED();
} }
} }
} }
src/tests/angle_end2end_tests.gypi
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
'<(angle_path)/src/tests/gl_tests/CopyTexImageTest.cpp', '<(angle_path)/src/tests/gl_tests/CopyTexImageTest.cpp',
'<(angle_path)/src/tests/gl_tests/CubeMapTextureTest.cpp', '<(angle_path)/src/tests/gl_tests/CubeMapTextureTest.cpp',
'<(angle_path)/src/tests/gl_tests/DebugMarkerTest.cpp', '<(angle_path)/src/tests/gl_tests/DebugMarkerTest.cpp',
'<(angle_path)/src/tests/gl_tests/DebugTest.cpp',
'<(angle_path)/src/tests/gl_tests/DepthStencilFormatsTest.cpp', '<(angle_path)/src/tests/gl_tests/DepthStencilFormatsTest.cpp',
'<(angle_path)/src/tests/gl_tests/DiscardFramebufferEXTTest.cpp', '<(angle_path)/src/tests/gl_tests/DiscardFramebufferEXTTest.cpp',
'<(angle_path)/src/tests/gl_tests/DrawBuffersTest.cpp', '<(angle_path)/src/tests/gl_tests/DrawBuffersTest.cpp',
......
src/tests/test_utils/ANGLETest.cpp
...@@ -223,11 +223,6 @@ void ANGLETest::setMultisampleEnabled(bool enabled) ...@@ -223,11 +223,6 @@ void ANGLETest::setMultisampleEnabled(bool enabled)
mEGLWindow->setMultisample(enabled); mEGLWindow->setMultisample(enabled);
} }
void ANGLETest::setDebugEnabled(bool enabled)
{
mEGLWindow->setDebugEnabled(enabled);
}
int ANGLETest::getClientVersion() const int ANGLETest::getClientVersion() const
{ {
return mEGLWindow->getClientMajorVersion(); return mEGLWindow->getClientMajorVersion();
......
src/tests/test_utils/ANGLETest.h
...@@ -96,7 +96,6 @@ class ANGLETest : public ::testing::TestWithParam<angle::PlatformParameters> ...@@ -96,7 +96,6 @@ class ANGLETest : public ::testing::TestWithParam<angle::PlatformParameters>
void setConfigDepthBits(int bits); void setConfigDepthBits(int bits);
void setConfigStencilBits(int bits); void setConfigStencilBits(int bits);
void setMultisampleEnabled(bool enabled); void setMultisampleEnabled(bool enabled);
void setDebugEnabled(bool enabled);
int getClientVersion() const; int getClientVersion() const;
......
util/EGLWindow.cpp
...@@ -85,7 +85,6 @@ EGLWindow::EGLWindow(EGLint glesMajorVersion, ...@@ -85,7 +85,6 @@ EGLWindow::EGLWindow(EGLint glesMajorVersion,
mDepthBits(-1), mDepthBits(-1),
mStencilBits(-1), mStencilBits(-1),
mMultisample(false), mMultisample(false),
mDebug(false),
mSwapInterval(-1) mSwapInterval(-1)
{ {
} }
...@@ -225,9 +224,6 @@ bool EGLWindow::initializeGL(OSWindow *osWindow) ...@@ -225,9 +224,6 @@ bool EGLWindow::initializeGL(OSWindow *osWindow)
contextAttributes.push_back(EGL_CONTEXT_MINOR_VERSION_KHR); contextAttributes.push_back(EGL_CONTEXT_MINOR_VERSION_KHR);
contextAttributes.push_back(mClientMinorVersion); contextAttributes.push_back(mClientMinorVersion);
contextAttributes.push_back(EGL_CONTEXT_OPENGL_DEBUG);
contextAttributes.push_back(mDebug ? EGL_TRUE : EGL_FALSE);
} }
contextAttributes.push_back(EGL_NONE); contextAttributes.push_back(EGL_NONE);
......
util/EGLWindow.h
...@@ -59,7 +59,6 @@ class EGLWindow : angle::NonCopyable ...@@ -59,7 +59,6 @@ class EGLWindow : angle::NonCopyable
void setConfigDepthBits(int bits) { mDepthBits = bits; } void setConfigDepthBits(int bits) { mDepthBits = bits; }
void setConfigStencilBits(int bits) { mStencilBits = bits; } void setConfigStencilBits(int bits) { mStencilBits = bits; }
void setMultisample(bool multisample) { mMultisample = multisample; } void setMultisample(bool multisample) { mMultisample = multisample; }
void setDebugEnabled(bool debug) { mDebug = debug; }
void setSwapInterval(EGLint swapInterval) { mSwapInterval = swapInterval; } void setSwapInterval(EGLint swapInterval) { mSwapInterval = swapInterval; }
static EGLBoolean FindEGLConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *config); static EGLBoolean FindEGLConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *config);
...@@ -80,7 +79,6 @@ class EGLWindow : angle::NonCopyable ...@@ -80,7 +79,6 @@ class EGLWindow : angle::NonCopyable
int getConfigDepthBits() const { return mDepthBits; } int getConfigDepthBits() const { return mDepthBits; }
int getConfigStencilBits() const { return mStencilBits; } int getConfigStencilBits() const { return mStencilBits; }
bool isMultisample() const { return mMultisample; } bool isMultisample() const { return mMultisample; }
bool isDebugEnabled() const { return mDebug; }
EGLint getSwapInterval() const { return mSwapInterval; } EGLint getSwapInterval() const { return mSwapInterval; }
bool initializeGL(OSWindow *osWindow); bool initializeGL(OSWindow *osWindow);
...@@ -103,7 +101,6 @@ class EGLWindow : angle::NonCopyable ...@@ -103,7 +101,6 @@ class EGLWindow : angle::NonCopyable
int mDepthBits; int mDepthBits;
int mStencilBits; int mStencilBits;
bool mMultisample; bool mMultisample;
bool mDebug;
EGLint mSwapInterval; EGLint mSwapInterval;
}; };
......
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