kc3-lang/angle/src/libANGLE/renderer/gl/DisplayGL.cpp

• Show log

  Commit

• Hash : 08142700
  Author :
  Date : 2020-10-01T19:30:03
  

  Work-around test runner & DebugAnnotator
  
  Note: This precedes another CL that needs this change.
  
  DebugAnnotator uses a global variable.  The test runner doesn't change
  state between testing different back-ends.  This works-around the
  problem by setting the global variable when the context is switched.
  
  Because the GL back-end doesn't have its own DebugAnnotator sub-class,
  add a Display* to DisplayImpl::makeCurrent(), so that
  DisplayGL::makeCurrent() can install the front-end-Display's
  DebugAnnotator.
  
  Note: the Vulkan back-end gets this fix even though the new
  DebugAnnotatorVk class will be added in a follow-on CL.
  
  Bug: b/162068318
  Bug: b/169243237
  Bug: angleproject:5121
  Change-Id: If08626a5310f9b4e3210e1a897a6886248e4d8ac
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2451423
  Reviewed-by: Ian Elliott <ianelliott@google.com>
  Commit-Queue: Ian Elliott <ianelliott@google.com>
  

Download

• src/libANGLE/renderer/gl/DisplayGL.cpp

• //
  // 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.
  //
  
  // DisplayGL.h: GL implementation of egl::Display
  
  #include "libANGLE/renderer/gl/DisplayGL.h"
  
  #include "libANGLE/AttributeMap.h"
  #include "libANGLE/Context.h"
  #include "libANGLE/Display.h"
  #include "libANGLE/Surface.h"
  #include "libANGLE/renderer/gl/ContextGL.h"
  #include "libANGLE/renderer/gl/RendererGL.h"
  #include "libANGLE/renderer/gl/StateManagerGL.h"
  #include "libANGLE/renderer/gl/SurfaceGL.h"
  
  #include <EGL/eglext.h>
  
  namespace rx
  {
  
  DisplayGL::DisplayGL(const egl::DisplayState &state) : DisplayImpl(state) {}
  
  DisplayGL::~DisplayGL() {}
  
  egl::Error DisplayGL::initialize(egl::Display *display)
  {
      return egl::NoError();
  }
  
  void DisplayGL::terminate() {}
  
  ImageImpl *DisplayGL::createImage(const egl::ImageState &state,
                                    const gl::Context *context,
                                    EGLenum target,
                                    const egl::AttributeMap &attribs)
  {
      UNIMPLEMENTED();
      return nullptr;
  }
  
  StreamProducerImpl *DisplayGL::createStreamProducerD3DTexture(
      egl::Stream::ConsumerType consumerType,
      const egl::AttributeMap &attribs)
  {
      UNIMPLEMENTED();
      return nullptr;
  }
  
  ShareGroupImpl *DisplayGL::createShareGroup()
  {
      return new ShareGroupGL();
  }
  
  egl::Error DisplayGL::makeCurrent(egl::Display *display,
                                    egl::Surface *drawSurface,
                                    egl::Surface *readSurface,
                                    gl::Context *context)
  {
      // Ensure that the correct global DebugAnnotator is installed when the end2end tests change
      // the ANGLE back-end (done frequently).
      display->setGlobalDebugAnnotator();
  
      if (!context)
      {
          return egl::NoError();
      }
  
      // Pause transform feedback before making a new surface current, to workaround anglebug.com/1426
      ContextGL *glContext = GetImplAs<ContextGL>(context);
      glContext->getStateManager()->pauseTransformFeedback();
  
      if (drawSurface == nullptr)
      {
          ANGLE_TRY(makeCurrentSurfaceless(context));
      }
  
      return egl::NoError();
  }
  
  gl::Version DisplayGL::getMaxConformantESVersion() const
  {
      // 3.1 support is in progress.
      return std::min(getMaxSupportedESVersion(), gl::Version(3, 0));
  }
  
  void DisplayGL::generateExtensions(egl::DisplayExtensions *outExtensions) const
  {
      // Advertise robust resource initialization on all OpenGL backends for testing even though it is
      // not fully implemented.
      outExtensions->robustResourceInitialization = true;
  }
  
  egl::Error DisplayGL::makeCurrentSurfaceless(gl::Context *context)
  {
      UNIMPLEMENTED();
      return egl::NoError();
  }
  }  // namespace rx
  

Download