kc3-lang/angle/src/libANGLE/Surface.cpp

• Show log

  Commit

• Hash : 6b120b9f
  Author :
  Date : 2015-11-24T13:00:07
  

  Add checks for FBO attachment layer.
  
  We would allow the app to attach layers that were out-of-bounds. Fix
  this by checking against the underlying resource dimensions. Also
  rework the code a bit to clean up the texture size query, which is
  available from the ImageDesc.
  
  BUG=angleproject:869
  
  Change-Id: I984f1db16daea6ca650d795884d8ec2cb8f05ebb
  Reviewed-on: https://chromium-review.googlesource.com/313991
  Tryjob-Request: Jamie Madill <jmadill@chromium.org>
  Reviewed-by: Geoff Lang <geofflang@chromium.org>
  Reviewed-by: Corentin Wallez <cwallez@chromium.org>
  Tested-by: Jamie Madill <jmadill@chromium.org>
  

Download

• src/libANGLE/Surface.cpp

• //
  // Copyright (c) 2002-2014 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.
  //
  
  // Surface.cpp: Implements the egl::Surface class, representing a drawing surface
  // such as the client area of a window, including any back buffers.
  // Implements EGLSurface and related functionality. [EGL 1.4] section 2.2 page 3.
  
  #include "libANGLE/Surface.h"
  
  #include "libANGLE/Config.h"
  #include "libANGLE/Framebuffer.h"
  #include "libANGLE/Texture.h"
  
  #include <EGL/eglext.h>
  
  #include <iostream>
  
  namespace egl
  {
  
  Surface::Surface(rx::SurfaceImpl *impl,
                   EGLint surfaceType,
                   const egl::Config *config,
                   const AttributeMap &attributes)
      : FramebufferAttachmentObject(),
        mImplementation(impl),
        mDefaultFramebuffer(nullptr),
        mCurrentCount(0),
        mDestroyed(false),
        mType(surfaceType),
        mConfig(config),
        mPostSubBufferRequested(false),
        mFixedSize(false),
        mFixedWidth(0),
        mFixedHeight(0),
        mTextureFormat(EGL_NO_TEXTURE),
        mTextureTarget(EGL_NO_TEXTURE),
        // FIXME: Determine actual pixel aspect ratio
        mPixelAspectRatio(static_cast<EGLint>(1.0 * EGL_DISPLAY_SCALING)),
        mRenderBuffer(EGL_BACK_BUFFER),
        mSwapBehavior(impl->getSwapBehavior())
  {
      mPostSubBufferRequested = (attributes.get(EGL_POST_SUB_BUFFER_SUPPORTED_NV, EGL_FALSE) == EGL_TRUE);
  
      mFixedSize = (attributes.get(EGL_FIXED_SIZE_ANGLE, EGL_FALSE) == EGL_TRUE);
      if (mFixedSize)
      {
          mFixedWidth = attributes.get(EGL_WIDTH, 0);
          mFixedHeight = attributes.get(EGL_HEIGHT, 0);
      }
  
      if (mType != EGL_WINDOW_BIT)
      {
          mTextureFormat = attributes.get(EGL_TEXTURE_FORMAT, EGL_NO_TEXTURE);
          mTextureTarget = attributes.get(EGL_TEXTURE_TARGET, EGL_NO_TEXTURE);
      }
  
      mDefaultFramebuffer = createDefaultFramebuffer();
      ASSERT(mDefaultFramebuffer != nullptr);
  }
  
  Surface::~Surface()
  {
      if (mTexture.get())
      {
          if (mImplementation)
          {
              mImplementation->releaseTexImage(EGL_BACK_BUFFER);
          }
          mTexture->releaseTexImageFromSurface();
          mTexture.set(nullptr);
      }
  
      SafeDelete(mDefaultFramebuffer);
      SafeDelete(mImplementation);
  }
  
  void Surface::setIsCurrent(bool isCurrent)
  {
      if (isCurrent)
      {
          mCurrentCount++;
      }
      else
      {
          ASSERT(mCurrentCount > 0);
          mCurrentCount--;
          if (mCurrentCount == 0 && mDestroyed)
          {
              delete this;
          }
      }
  }
  
  void Surface::onDestroy()
  {
      mDestroyed = true;
      if (mCurrentCount == 0)
      {
          delete this;
      }
  }
  
  EGLint Surface::getType() const
  {
      return mType;
  }
  
  Error Surface::swap()
  {
      return mImplementation->swap();
  }
  
  Error Surface::postSubBuffer(EGLint x, EGLint y, EGLint width, EGLint height)
  {
      return mImplementation->postSubBuffer(x, y, width, height);
  }
  
  Error Surface::querySurfacePointerANGLE(EGLint attribute, void **value)
  {
      return mImplementation->querySurfacePointerANGLE(attribute, value);
  }
  
  EGLint Surface::isPostSubBufferSupported() const
  {
      return mPostSubBufferRequested && mImplementation->isPostSubBufferSupported();
  }
  
  void Surface::setSwapInterval(EGLint interval)
  {
      mImplementation->setSwapInterval(interval);
  }
  
  const Config *Surface::getConfig() const
  {
      return mConfig;
  }
  
  EGLint Surface::getPixelAspectRatio() const
  {
      return mPixelAspectRatio;
  }
  
  EGLenum Surface::getRenderBuffer() const
  {
      return mRenderBuffer;
  }
  
  EGLenum Surface::getSwapBehavior() const
  {
      return mSwapBehavior;
  }
  
  EGLenum Surface::getTextureFormat() const
  {
      return mTextureFormat;
  }
  
  EGLenum Surface::getTextureTarget() const
  {
      return mTextureTarget;
  }
  
  EGLint Surface::isFixedSize() const
  {
      return mFixedSize;
  }
  
  EGLint Surface::getWidth() const
  {
      return mFixedSize ? static_cast<EGLint>(mFixedWidth) : mImplementation->getWidth();
  }
  
  EGLint Surface::getHeight() const
  {
      return mFixedSize ? static_cast<EGLint>(mFixedHeight) : mImplementation->getHeight();
  }
  
  Error Surface::bindTexImage(gl::Texture *texture, EGLint buffer)
  {
      ASSERT(!mTexture.get());
  
      texture->bindTexImageFromSurface(this);
      mTexture.set(texture);
      return mImplementation->bindTexImage(buffer);
  }
  
  Error Surface::releaseTexImage(EGLint buffer)
  {
      ASSERT(mTexture.get());
      mTexture->releaseTexImageFromSurface();
      mTexture.set(nullptr);
  
      return mImplementation->releaseTexImage(buffer);
  }
  
  void Surface::releaseTexImageFromTexture()
  {
      ASSERT(mTexture.get());
      mTexture.set(nullptr);
  }
  
  gl::Extents Surface::getAttachmentSize(const gl::FramebufferAttachment::Target & /*target*/) const
  {
      return gl::Extents(getWidth(), getHeight(), 1);
  }
  
  GLenum Surface::getAttachmentInternalFormat(const gl::FramebufferAttachment::Target &target) const
  {
      const egl::Config *config = getConfig();
      return (target.binding() == GL_BACK ? config->renderTargetFormat : config->depthStencilFormat);
  }
  
  GLsizei Surface::getAttachmentSamples(const gl::FramebufferAttachment::Target &target) const
  {
      return getConfig()->samples;
  }
  
  GLuint Surface::getId() const
  {
      UNREACHABLE();
      return 0;
  }
  
  gl::Framebuffer *Surface::createDefaultFramebuffer()
  {
      gl::Framebuffer *framebuffer = new gl::Framebuffer(mImplementation);
  
      GLenum drawBufferState = GL_BACK;
      framebuffer->setDrawBuffers(1, &drawBufferState);
      framebuffer->setReadBuffer(GL_BACK);
  
      framebuffer->setAttachment(GL_FRAMEBUFFER_DEFAULT, GL_BACK, gl::ImageIndex::MakeInvalid(),
                                 this);
  
      if (mConfig->depthSize > 0)
      {
          framebuffer->setAttachment(GL_FRAMEBUFFER_DEFAULT, GL_DEPTH, gl::ImageIndex::MakeInvalid(),
                                     this);
      }
  
      if (mConfig->stencilSize > 0)
      {
          framebuffer->setAttachment(GL_FRAMEBUFFER_DEFAULT, GL_STENCIL,
                                     gl::ImageIndex::MakeInvalid(), this);
      }
  
      return framebuffer;
  }
  }
  

Download