kc3-lang/angle/src/libANGLE/queryconversions.h

• Show log

  Commit

• Hash : 3c43b4d1
  Author :
  Date : 2018-02-23T11:08:28
  

  Fix incorrect conversion in ConvertToGLint
  
  This patch fixes a bug in function ConvertToGLint. This function
  should convert ParamType into GLint instead of GLenum.
  
  This patch can fix the bug that no errors are generated when trying
  to set negative base level or max level by glTexParameteri because
  ConvertToGLint always incorrectly converts a negative integer into
  an unsigned integer in ValidateTexParameterBase.
  
  BUG=angleproject:2371
  TEST=angle_end2end_tests
       dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.texparameter*
  Change-Id: Id5baf3430ae574a083bcc40a7a8f7db1cb2d07ed
  Reviewed-on: https://chromium-review.googlesource.com/933923
  Reviewed-by: Jamie Madill <jmadill@chromium.org>
  Reviewed-by: Jiajia Qin <jiajia.qin@intel.com>
  Commit-Queue: Jamie Madill <jmadill@chromium.org>
  

Download

• src/libANGLE/queryconversions.h

• //
  // Copyright (c) 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.
  //
  
  // queryconversions.h: Declaration of state query cast conversions
  
  #ifndef LIBANGLE_QUERY_CONVERSIONS_H_
  #define LIBANGLE_QUERY_CONVERSIONS_H_
  
  #include "angle_gl.h"
  #include "common/angleutils.h"
  
  namespace gl
  {
  class Context;
  
  // Helper class for converting a GL type to a GLenum:
  // We can't use CastStateValueEnum generally, because of GLboolean + GLubyte overlap.
  // We restrict our use to CastFromStateValue and CastQueryValueTo, where it eliminates
  // duplicate parameters.
  
  template <typename GLType>
  struct GLTypeToGLenum
  {
      // static constexpr GLenum value;
  };
  
  template <>
  struct GLTypeToGLenum<GLint>
  {
      static constexpr GLenum value = GL_INT;
  };
  template <>
  struct GLTypeToGLenum<GLuint>
  {
      static constexpr GLenum value = GL_UNSIGNED_INT;
  };
  template <>
  struct GLTypeToGLenum<GLboolean>
  {
      static constexpr GLenum value = GL_BOOL;
  };
  template <>
  struct GLTypeToGLenum<GLint64>
  {
      static constexpr GLenum value = GL_INT_64_ANGLEX;
  };
  template <>
  struct GLTypeToGLenum<GLuint64>
  {
      static constexpr GLenum value = GL_UINT_64_ANGLEX;
  };
  template <>
  struct GLTypeToGLenum<GLfloat>
  {
      static constexpr GLenum value = GL_FLOAT;
  };
  
  GLint CastMaskValue(const Context *context, GLuint value);
  
  template <typename QueryT, typename InternalT>
  QueryT CastFromGLintStateValue(GLenum pname, InternalT value);
  
  template <typename QueryT, typename NativeT>
  QueryT CastFromStateValue(GLenum pname, NativeT value);
  
  template <typename NativeT, typename QueryT>
  NativeT CastQueryValueTo(GLenum pname, QueryT value);
  
  template <typename ParamType>
  GLenum ConvertToGLenum(GLenum pname, ParamType param)
  {
      return static_cast<GLenum>(CastQueryValueTo<GLuint>(pname, param));
  }
  
  template <typename ParamType>
  GLenum ConvertToGLenum(ParamType param)
  {
      return ConvertToGLenum(GL_NONE, param);
  }
  
  template <typename ParamType>
  GLint ConvertToGLint(ParamType param)
  {
      return CastQueryValueTo<GLint>(GL_NONE, param);
  }
  
  template <typename ParamType>
  bool ConvertToBool(ParamType param)
  {
      return param != GL_FALSE;
  }
  
  template <typename ParamType>
  GLboolean ConvertToGLBoolean(ParamType param)
  {
      return param ? GL_TRUE : GL_FALSE;
  }
  
  // The GL state query API types are: bool, int, uint, float, int64, uint64
  template <typename QueryT>
  void CastStateValues(Context *context, GLenum nativeType, GLenum pname,
                       unsigned int numParams, QueryT *outParams);
  
  // The GL state query API types are: bool, int, uint, float, int64, uint64
  template <typename QueryT>
  void CastIndexedStateValues(Context *context,
                              GLenum nativeType,
                              GLenum pname,
                              GLuint index,
                              unsigned int numParams,
                              QueryT *outParams);
  }
  
  #endif  // LIBANGLE_QUERY_CONVERSIONS_H_
  

Download