Hash :
cb286073
Author :
Date :
2020-09-20T21:59:24
Use c++ thread_local for current thread. This solves a race condition using the global context. Sadly we can't use an unprotected variable safely because it can be written/read from multiple threads doing MakeCurrent. Has about a 2 ns regression when tested in Linux/Release per call. "null" benchmark test went from 27 -> 29 ns/iteration. Fixes a TSAN warning that popped up in angle_end2end_tests. Test: DrawCallPerfBenchmark.Run/vulkan_null Test: EGLContextASANTest.DestroyContextInUse/ES3_Vulkan Bug: b/168744561 Change-Id: Ic56f3faae81c1087b942a3cfc0e011b9ab439e0f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2419641 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: 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
//
// Copyright 2016 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.
//
// Thread.cpp : Defines the Thread class which represents a global EGL thread.
#include "libANGLE/Thread.h"
#include "libANGLE/Context.h"
#include "libANGLE/Debug.h"
#include "libANGLE/Error.h"
namespace angle
{
bool gUseAndroidOpenGLTlsSlot;
} // namespace angle
namespace egl
{
Thread::Thread()
: mLabel(nullptr),
mError(EGL_SUCCESS),
mAPI(EGL_OPENGL_ES_API),
mContext(static_cast<gl::Context *>(EGL_NO_CONTEXT))
{}
void Thread::setLabel(EGLLabelKHR label)
{
mLabel = label;
}
EGLLabelKHR Thread::getLabel() const
{
return mLabel;
}
void Thread::setSuccess()
{
mError = EGL_SUCCESS;
}
void Thread::setError(const Error &error,
const Debug *debug,
const char *command,
const LabeledObject *object)
{
ASSERT(debug != nullptr);
mError = error.getCode();
if (error.isError() && !error.getMessage().empty())
{
debug->insertMessage(error.getCode(), command, ErrorCodeToMessageType(error.getCode()),
getLabel(), object ? object->getLabel() : nullptr, error.getMessage());
}
}
EGLint Thread::getError() const
{
return mError;
}
void Thread::setAPI(EGLenum api)
{
mAPI = api;
}
EGLenum Thread::getAPI() const
{
return mAPI;
}
void Thread::setCurrent(gl::Context *context)
{
mContext = context;
}
Surface *Thread::getCurrentDrawSurface() const
{
if (mContext)
{
return mContext->getCurrentDrawSurface();
}
return nullptr;
}
Surface *Thread::getCurrentReadSurface() const
{
if (mContext)
{
return mContext->getCurrentReadSurface();
}
return nullptr;
}
gl::Context *Thread::getContext() const
{
return mContext;
}
Display *Thread::getDisplay() const
{
if (mContext)
{
return mContext->getDisplay();
}
return nullptr;
}
} // namespace egl