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

• Show log

  Commit

• Hash : d470f472
  Author :
  Date : 2015-10-20T13:34:25
  

  Don't ASSERT shader compilation success in ShaderGL.
  
  This assertion was useful for debugging the initial implementation but it
  is becoming an issue in tryjobs where tests will hang instead of fail due
  to driver bugs.
  
  BUG=angleproject:882
  
  Change-Id: Ib23a0d16dfe250ea175a166b5e277bf07d80a2fa
  Reviewed-on: https://chromium-review.googlesource.com/307460
  Tryjob-Request: Geoff Lang <geofflang@chromium.org>
  Reviewed-by: Jamie Madill <jmadill@chromium.org>
  Tested-by: Geoff Lang <geofflang@chromium.org>
  

Download

• src/libANGLE/renderer/gl/ShaderGL.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.
  //
  
  // ShaderGL.cpp: Implements the class methods for ShaderGL.
  
  #include "libANGLE/renderer/gl/ShaderGL.h"
  
  #include "common/debug.h"
  #include "libANGLE/Compiler.h"
  #include "libANGLE/renderer/gl/FunctionsGL.h"
  #include "libANGLE/renderer/gl/RendererGL.h"
  #include "libANGLE/renderer/gl/WorkaroundsGL.h"
  
  #include <iostream>
  
  namespace rx
  {
  
  ShaderGL::ShaderGL(const gl::Shader::Data &data,
                     const FunctionsGL *functions,
                     const WorkaroundsGL &workarounds)
      : ShaderImpl(data), mFunctions(functions), mWorkarounds(workarounds), mShaderID(0)
  {
      ASSERT(mFunctions);
  }
  
  ShaderGL::~ShaderGL()
  {
      if (mShaderID != 0)
      {
          mFunctions->deleteShader(mShaderID);
          mShaderID = 0;
      }
  }
  
  int ShaderGL::prepareSourceAndReturnOptions(std::stringstream *sourceStream,
                                              std::string * /*sourcePath*/)
  {
      // Reset the previous state
      if (mShaderID != 0)
      {
          mFunctions->deleteShader(mShaderID);
          mShaderID = 0;
      }
  
      *sourceStream << mData.getSource();
  
      int options = SH_INIT_GL_POSITION;
  
      if (mWorkarounds.doWhileGLSLCausesGPUHang)
      {
          options |= SH_REWRITE_DO_WHILE_LOOPS;
      }
  
      return options;
  }
  
  bool ShaderGL::postTranslateCompile(gl::Compiler *compiler, std::string *infoLog)
  {
      // Translate the ESSL into GLSL
      const char *translatedSourceCString = mData.getTranslatedSource().c_str();
  
      // Generate a shader object and set the source
      mShaderID = mFunctions->createShader(mData.getShaderType());
      mFunctions->shaderSource(mShaderID, 1, &translatedSourceCString, nullptr);
      mFunctions->compileShader(mShaderID);
  
      // Check for compile errors from the native driver
      GLint compileStatus = GL_FALSE;
      mFunctions->getShaderiv(mShaderID, GL_COMPILE_STATUS, &compileStatus);
      if (compileStatus == GL_FALSE)
      {
          // Compilation failed, put the error into the info log
          GLint infoLogLength = 0;
          mFunctions->getShaderiv(mShaderID, GL_INFO_LOG_LENGTH, &infoLogLength);
  
          std::vector<char> buf(infoLogLength);
          mFunctions->getShaderInfoLog(mShaderID, infoLogLength, nullptr, &buf[0]);
  
          mFunctions->deleteShader(mShaderID);
          mShaderID = 0;
  
          *infoLog = &buf[0];
          TRACE("\n%s", infoLog->c_str());
          return false;
      }
  
      return true;
  }
  
  std::string ShaderGL::getDebugInfo() const
  {
      return std::string();
  }
  
  GLuint ShaderGL::getShaderID() const
  {
      return mShaderID;
  }
  
  }
  

Download