Bug 1878375 - Synchronize vendored Rust libraries with mozilla-central. r=thunderbird-reviewers,babolivier
mozilla-central: 61cb2b6b27f57fbb945c3b3613bf7c458ff4abf4 comm-central: 1fdad282b02e9f612ae5aa502e83a34739d1fc29 Differential Revision: https://phabricator.services.mozilla.com/D202417 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Ikey Doherty
Родитель
0c83550bb0
Коммит
837252e6bc
|
|
@ -2131,9 +2131,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "glslopt"
|
||||
version = "0.1.9"
|
||||
version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "74a3f5c04450dfdadb4b08f6e5ee6f5110f674de1acbd6199bfec68392a8cbaf"
|
||||
checksum = "ee5be629003d587bab188f3e2e3b010aa2cde7c41ec967b3a244f388d4d81877"
|
||||
dependencies = [
|
||||
"cc",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"mc_workspace_toml": "7716fecacaac895b9883d93e900f7c354247f2425992a2e0fc534801190225014e017778b1f53cf07fa1bcef92bd9f3fbd5bc72ee043c87ccc9f6430dddc479d", "mc_gkrust_toml": "b3c12a012dcbed2e50f0754847b84a2ed1d0f9b6c1e8d59551d81725678932c12aa2b81449aff8b645d0d40a090b146ce8fa1a0da1e22457bb3b49202bc09505", "mc_cargo_lock": "6c56454f624e1bf560509944d46df4ff35f7e920ce5e6a4cad15cd4656808810efaef60a38a78c4746240f14485897f84d8fd01a3f3bbd4e7333ffb13942c35e"}
|
||||
{"mc_workspace_toml": "7716fecacaac895b9883d93e900f7c354247f2425992a2e0fc534801190225014e017778b1f53cf07fa1bcef92bd9f3fbd5bc72ee043c87ccc9f6430dddc479d", "mc_gkrust_toml": "b3c12a012dcbed2e50f0754847b84a2ed1d0f9b6c1e8d59551d81725678932c12aa2b81449aff8b645d0d40a090b146ce8fa1a0da1e22457bb3b49202bc09505", "mc_cargo_lock": "d3a03b0cf81bb716a908abaad572a9e5a53b563ffb1bc156dd3b0e20b93cf59c923c7fcfa2ffd08e0de72977189f2a0ec3d2abdeb71ec65ad75e7547bc52857f"}
|
||||
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
|
@ -3,21 +3,28 @@
|
|||
# When uploading crates to the registry Cargo will automatically
|
||||
# "normalize" Cargo.toml files for maximal compatibility
|
||||
# with all versions of Cargo and also rewrite `path` dependencies
|
||||
# to registry (e.g., crates.io) dependencies
|
||||
# to registry (e.g., crates.io) dependencies.
|
||||
#
|
||||
# If you believe there's an error in this file please file an
|
||||
# issue against the rust-lang/cargo repository. If you're
|
||||
# editing this file be aware that the upstream Cargo.toml
|
||||
# will likely look very different (and much more reasonable)
|
||||
# If you are reading this file be aware that the original Cargo.toml
|
||||
# will likely look very different (and much more reasonable).
|
||||
# See Cargo.toml.orig for the original contents.
|
||||
|
||||
[package]
|
||||
edition = "2018"
|
||||
name = "glslopt"
|
||||
version = "0.1.9"
|
||||
version = "0.1.10"
|
||||
authors = ["Jamie Nicol <jnicol@mozilla.com>"]
|
||||
description = "Optimizes GLSL shader code"
|
||||
keywords = ["opengl", "gl", "gles", "glsl", "shader"]
|
||||
readme = "README.md"
|
||||
keywords = [
|
||||
"opengl",
|
||||
"gl",
|
||||
"gles",
|
||||
"glsl",
|
||||
"shader",
|
||||
]
|
||||
license = "MIT"
|
||||
repository = "https://github.com/jamienicol/glslopt-rs"
|
||||
|
||||
[build-dependencies.cc]
|
||||
version = "1.0"
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
/**************************************************************************
|
||||
*
|
||||
* Copyright 2015 VMware, Inc.
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sub license, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the
|
||||
* next paragraph) shall be included in all copies or substantial portions
|
||||
* of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
|
||||
* IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
|
||||
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
#ifndef _C99_ALLOCA_H_
|
||||
#define _C99_ALLOCA_H_
|
||||
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
|
||||
# include <malloc.h>
|
||||
|
||||
# define alloca _alloca
|
||||
|
||||
#elif defined(__sun) || defined(__CYGWIN__)
|
||||
|
||||
# include <alloca.h>
|
||||
|
||||
#else /* !defined(_MSC_VER) */
|
||||
|
||||
# include <stdlib.h>
|
||||
|
||||
#endif /* !defined(_MSC_VER) */
|
||||
|
||||
|
||||
#endif
|
||||
|
|
@ -1,211 +0,0 @@
|
|||
/**************************************************************************
|
||||
*
|
||||
* Copyright 2007-2015 VMware, Inc.
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sub license, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the
|
||||
* next paragraph) shall be included in all copies or substantial portions
|
||||
* of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
|
||||
* IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
|
||||
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
/**
|
||||
* Wrapper for math.h which makes sure we have definitions of all the c99
|
||||
* functions.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef _C99_MATH_H_
|
||||
#define _C99_MATH_H_
|
||||
|
||||
#include <math.h>
|
||||
#include "c99_compat.h"
|
||||
|
||||
|
||||
/* This is to ensure that we get M_PI, etc. definitions */
|
||||
#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)
|
||||
#error _USE_MATH_DEFINES define required when building with MSVC
|
||||
#endif
|
||||
|
||||
|
||||
#if !defined(_MSC_VER) && \
|
||||
__STDC_VERSION__ < 199901L && \
|
||||
(!defined(_XOPEN_SOURCE) || _XOPEN_SOURCE < 600) && \
|
||||
!defined(__cplusplus)
|
||||
|
||||
static inline long int
|
||||
lrint(double d)
|
||||
{
|
||||
long int rounded = (long int)(d + 0.5);
|
||||
|
||||
if (d - floor(d) == 0.5) {
|
||||
if (rounded % 2 != 0)
|
||||
rounded += (d > 0) ? -1 : 1;
|
||||
}
|
||||
|
||||
return rounded;
|
||||
}
|
||||
|
||||
static inline long int
|
||||
lrintf(float f)
|
||||
{
|
||||
long int rounded = (long int)(f + 0.5f);
|
||||
|
||||
if (f - floorf(f) == 0.5f) {
|
||||
if (rounded % 2 != 0)
|
||||
rounded += (f > 0) ? -1 : 1;
|
||||
}
|
||||
|
||||
return rounded;
|
||||
}
|
||||
|
||||
static inline long long int
|
||||
llrint(double d)
|
||||
{
|
||||
long long int rounded = (long long int)(d + 0.5);
|
||||
|
||||
if (d - floor(d) == 0.5) {
|
||||
if (rounded % 2 != 0)
|
||||
rounded += (d > 0) ? -1 : 1;
|
||||
}
|
||||
|
||||
return rounded;
|
||||
}
|
||||
|
||||
static inline long long int
|
||||
llrintf(float f)
|
||||
{
|
||||
long long int rounded = (long long int)(f + 0.5f);
|
||||
|
||||
if (f - floorf(f) == 0.5f) {
|
||||
if (rounded % 2 != 0)
|
||||
rounded += (f > 0) ? -1 : 1;
|
||||
}
|
||||
|
||||
return rounded;
|
||||
}
|
||||
|
||||
static inline float
|
||||
exp2f(float f)
|
||||
{
|
||||
return powf(2.0f, f);
|
||||
}
|
||||
|
||||
static inline double
|
||||
exp2(double d)
|
||||
{
|
||||
return pow(2.0, d);
|
||||
}
|
||||
|
||||
#endif /* C99 */
|
||||
|
||||
|
||||
/*
|
||||
* signbit() is a macro on Linux. Not available on Windows.
|
||||
*/
|
||||
#ifndef signbit
|
||||
#define signbit(x) ((x) < 0.0f)
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef M_PI
|
||||
#define M_PI (3.14159265358979323846)
|
||||
#endif
|
||||
|
||||
#ifndef M_E
|
||||
#define M_E (2.7182818284590452354)
|
||||
#endif
|
||||
|
||||
#ifndef M_LOG2E
|
||||
#define M_LOG2E (1.4426950408889634074)
|
||||
#endif
|
||||
|
||||
#ifndef FLT_MAX_EXP
|
||||
#define FLT_MAX_EXP 128
|
||||
#endif
|
||||
|
||||
|
||||
#if defined(fpclassify)
|
||||
/* ISO C99 says that fpclassify is a macro. Assume that any implementation
|
||||
* of fpclassify, whether it's in a C99 compiler or not, will be a macro.
|
||||
*/
|
||||
#elif defined(__cplusplus)
|
||||
/* For C++, fpclassify() should be defined in <cmath> */
|
||||
#elif defined(_MSC_VER)
|
||||
/* Not required on VS2013 and above. Oddly, the fpclassify() function
|
||||
* doesn't exist in such a form on MSVC. This is an implementation using
|
||||
* slightly different lower-level Windows functions.
|
||||
*/
|
||||
#include <float.h>
|
||||
|
||||
static inline enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL}
|
||||
fpclassify(double x)
|
||||
{
|
||||
switch(_fpclass(x)) {
|
||||
case _FPCLASS_SNAN: /* signaling NaN */
|
||||
case _FPCLASS_QNAN: /* quiet NaN */
|
||||
return FP_NAN;
|
||||
case _FPCLASS_NINF: /* negative infinity */
|
||||
case _FPCLASS_PINF: /* positive infinity */
|
||||
return FP_INFINITE;
|
||||
case _FPCLASS_NN: /* negative normal */
|
||||
case _FPCLASS_PN: /* positive normal */
|
||||
return FP_NORMAL;
|
||||
case _FPCLASS_ND: /* negative denormalized */
|
||||
case _FPCLASS_PD: /* positive denormalized */
|
||||
return FP_SUBNORMAL;
|
||||
case _FPCLASS_NZ: /* negative zero */
|
||||
case _FPCLASS_PZ: /* positive zero */
|
||||
return FP_ZERO;
|
||||
default:
|
||||
/* Should never get here; but if we do, this will guarantee
|
||||
* that the pattern is not treated like a number.
|
||||
*/
|
||||
return FP_NAN;
|
||||
}
|
||||
}
|
||||
#else
|
||||
#error "Need to include or define an fpclassify function"
|
||||
#endif
|
||||
|
||||
|
||||
/* Since C++11, the following functions are part of the std namespace. Their C
|
||||
* counteparts should still exist in the global namespace, however cmath
|
||||
* undefines those functions, which in glibc 2.23, are defined as macros rather
|
||||
* than functions as in glibc 2.22.
|
||||
*/
|
||||
#if __cplusplus >= 201103L && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 23))
|
||||
#include <cmath>
|
||||
|
||||
using std::fpclassify;
|
||||
using std::isfinite;
|
||||
using std::isinf;
|
||||
using std::isnan;
|
||||
using std::isnormal;
|
||||
using std::signbit;
|
||||
using std::isgreater;
|
||||
using std::isgreaterequal;
|
||||
using std::isless;
|
||||
using std::islessequal;
|
||||
using std::islessgreater;
|
||||
using std::isunordered;
|
||||
#endif
|
||||
|
||||
|
||||
#endif /* #define _C99_MATH_H_ */
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
* Converts double trunc, ceil, floor, round to fract
|
||||
*/
|
||||
|
||||
#include "c99_math.h"
|
||||
#include <math.h>
|
||||
#include "program/prog_instruction.h" /* for swizzle */
|
||||
#include "compiler/glsl_types.h"
|
||||
#include "ir.h"
|
||||
|
|
|
|||
|
|
@ -24,9 +24,8 @@
|
|||
#ifndef _ROUNDING_H
|
||||
#define _ROUNDING_H
|
||||
|
||||
#include "c99_math.h"
|
||||
|
||||
#include <limits.h>
|
||||
#include <math.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#if defined(__SSE__) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 1)) || defined(_M_X64)
|
||||
|
|
|
|||
|
|
@ -38,10 +38,9 @@
|
|||
#ifndef U_MATH_H
|
||||
#define U_MATH_H
|
||||
|
||||
|
||||
#include "c99_math.h"
|
||||
#include <assert.h>
|
||||
#include <float.h>
|
||||
#include <math.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
#include "bitscan.h"
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче