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

• Show log

  Commit

• Hash : 58337799
  Author :
  Date : 2017-03-21T13:49:57
  

  Correctly initialize the condition of FenceSync objects.
  
  The spec says that the initial condition of a FenceSync object should be
  GL_SYNC_GPU_COMMANDS_COMPLETE.  Make sure this is set in case the
  condition is queried before the fence is set.
  
  TEST=conformance2/state/gl-object-get-calls.html
  BUG=602688
  
  Change-Id: I8c0451fc996c175109541f337191cc1be4b813e3
  Reviewed-on: https://chromium-review.googlesource.com/457452
  Reviewed-by: Corentin Wallez <cwallez@chromium.org>
  Reviewed-by: Jamie Madill <jmadill@chromium.org>
  Commit-Queue: Geoff Lang <geofflang@chromium.org>
  

Download

• src/libANGLE/Fence.cpp

• //
  // Copyright (c) 2002-2013 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.
  //
  
  // Fence.cpp: Implements the gl::FenceNV and gl::FenceSync classes, which support the GL_NV_fence
  // extension and GLES3 sync objects.
  
  #include "libANGLE/Fence.h"
  
  #include "angle_gl.h"
  
  #include "common/utilities.h"
  #include "libANGLE/renderer/FenceNVImpl.h"
  #include "libANGLE/renderer/FenceSyncImpl.h"
  
  namespace gl
  {
  
  FenceNV::FenceNV(rx::FenceNVImpl *impl)
      : mFence(impl),
        mIsSet(false),
        mStatus(GL_FALSE),
        mCondition(GL_NONE)
  {
  }
  
  FenceNV::~FenceNV()
  {
      SafeDelete(mFence);
  }
  
  Error FenceNV::set(GLenum condition)
  {
      Error error = mFence->set(condition);
      if (error.isError())
      {
          return error;
      }
  
      mCondition = condition;
      mStatus = GL_FALSE;
      mIsSet = true;
  
      return NoError();
  }
  
  Error FenceNV::test(GLboolean *outResult)
  {
      // Flush the command buffer by default
      Error error = mFence->test(&mStatus);
      if (error.isError())
      {
          return error;
      }
  
      *outResult = mStatus;
      return NoError();
  }
  
  Error FenceNV::finish()
  {
      ASSERT(mIsSet);
  
      gl::Error error = mFence->finish();
      if (error.isError())
      {
          return error;
      }
  
      mStatus = GL_TRUE;
  
      return NoError();
  }
  
  FenceSync::FenceSync(rx::FenceSyncImpl *impl, GLuint id)
      : RefCountObject(id), mFence(impl), mLabel(), mCondition(GL_SYNC_GPU_COMMANDS_COMPLETE), mFlags(0)
  {
  }
  
  FenceSync::~FenceSync()
  {
      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 error = mFence->set(condition, flags);
      if (error.isError())
      {
          return error;
      }
  
      mCondition = condition;
      mFlags = flags;
      return NoError();
  }
  
  Error FenceSync::clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResult)
  {
      ASSERT(mCondition != GL_NONE);
      return mFence->clientWait(flags, timeout, outResult);
  }
  
  Error FenceSync::serverWait(GLbitfield flags, GLuint64 timeout)
  {
      return mFence->serverWait(flags, timeout);
  }
  
  Error FenceSync::getStatus(GLint *outResult) const
  {
      return mFence->getStatus(outResult);
  }
  
  }
  

Download