Branch
Hash :
d8f088e0
Author :
Date :
2023-08-14T11:07:24
GL: Remove parallel compile/link without driver support This feature was practically disabled everywhere due to various bugs, and is complicating the code. In effect, the code was always spawning a thread for the compilation and link jobs, immediately fail it (due to a workaround), then do the job when compile/link is resolved (much closer to draw time). This leads to bad user experience, but also is racy because the shaders may get recompiled in the meantime and there is little the GL backend could do to stop that (efficiently). After this change, parallel compile/link is either done by the driver (if supported), or it isn't done. This is a partial revert of a100d8f471f79b9f88d387164992cc5bd9c6ee9f. Bug: angleproject:3031 Bug: chromium:922936 Bug: chromium:1184692 Bug: chromium:1202928 Change-Id: I6348bee3249ccb3828bb98ac2a69dc7d305f821c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4774785 Reviewed-by: Geoff Lang <geofflang@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
//
// 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.
//
// DisplayCGL.h: CGL implementation of egl::Display
#ifndef LIBANGLE_RENDERER_GL_CGL_DISPLAYCGL_H_
#define LIBANGLE_RENDERER_GL_CGL_DISPLAYCGL_H_
#include <unordered_set>
#include "libANGLE/renderer/gl/DisplayGL.h"
struct _CGLContextObject;
typedef _CGLContextObject *CGLContextObj;
struct _CGLPixelFormatObject;
typedef _CGLPixelFormatObject *CGLPixelFormatObj;
namespace rx
{
struct EnsureCGLContextIsCurrent : angle::NonCopyable
{
public:
EnsureCGLContextIsCurrent(CGLContextObj context);
~EnsureCGLContextIsCurrent();
private:
CGLContextObj mOldContext;
bool mResetContext;
};
class DisplayCGL : public DisplayGL
{
public:
DisplayCGL(const egl::DisplayState &state);
~DisplayCGL() override;
egl::Error initialize(egl::Display *display) override;
void terminate() override;
egl::Error prepareForCall() override;
egl::Error releaseThread() override;
egl::Error makeCurrent(egl::Display *display,
egl::Surface *drawSurface,
egl::Surface *readSurface,
gl::Context *context) override;
SurfaceImpl *createWindowSurface(const egl::SurfaceState &state,
EGLNativeWindowType window,
const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state,
const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state,
EGLenum buftype,
EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) override;
SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state,
NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) override;
ContextImpl *createContext(const gl::State &state,
gl::ErrorSet *errorSet,
const egl::Config *configuration,
const gl::Context *shareContext,
const egl::AttributeMap &attribs) override;
egl::ConfigSet generateConfigs() override;
bool testDeviceLost() override;
egl::Error restoreLostDevice(const egl::Display *display) override;
bool isValidNativeWindow(EGLNativeWindowType window) const override;
egl::Error validateClientBuffer(const egl::Config *configuration,
EGLenum buftype,
EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) const override;
DeviceImpl *createDevice() override;
egl::Error waitClient(const gl::Context *context) override;
egl::Error waitUntilWorkScheduled() override;
egl::Error waitNative(const gl::Context *context, EGLint engine) override;
gl::Version getMaxSupportedESVersion() const override;
CGLContextObj getCGLContext() const;
CGLPixelFormatObj getCGLPixelFormat() const;
void initializeFrontendFeatures(angle::FrontendFeatures *features) const override;
void populateFeatureList(angle::FeatureList *features) override;
RendererGL *getRenderer() const override;
// Support for dual-GPU MacBook Pros. Used only by ContextCGL. The use of
// these entry points is gated by the presence of dual GPUs.
egl::Error referenceDiscreteGPU();
egl::Error unreferenceDiscreteGPU();
egl::Error handleGPUSwitch() override;
egl::Error forceGPUSwitch(EGLint gpuIDHigh, EGLint gpuIDLow) override;
private:
egl::Error makeCurrentSurfaceless(gl::Context *context) override;
void generateExtensions(egl::DisplayExtensions *outExtensions) const override;
void generateCaps(egl::Caps *outCaps) const override;
void checkDiscreteGPUStatus();
void setContextToGPU(uint64_t gpuID, GLint virtualScreen);
std::shared_ptr<RendererGL> mRenderer;
egl::Display *mEGLDisplay;
CGLContextObj mContext;
std::unordered_set<uint64_t> mThreadsWithCurrentContext;
CGLPixelFormatObj mPixelFormat;
bool mSupportsGPUSwitching;
uint64_t mCurrentGPUID;
CGLPixelFormatObj mDiscreteGPUPixelFormat;
int mDiscreteGPURefs;
// This comes from the ANGLE platform's DefaultMonotonicallyIncreasingTime. If the discrete GPU
// is unref'd for the last time, this is set to the time of that last unref. If it isn't
// activated again in 10 seconds, the discrete GPU pixel format is deleted.
double mLastDiscreteGPUUnrefTime;
bool mDeviceContextIsVolatile = false;
};
} // namespace rx
#endif // LIBANGLE_RENDERER_GL_CGL_DISPLAYCGL_H_