diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-10-22 22:27:13 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-10-22 22:27:13 +0000 |
| commit | 4980a6cd48688c360a8c584d07405efb3cfe1fcf (patch) | |
| tree | bdc29876d4c984e6ab2910969b2fe141bab7955c | |
| parent | 496844b1cd22bb5b4d404d1488c889e19d757d62 (diff) | |
| parent | e740c825b11773ebe636675977e5f79de253c745 (diff) | |
| download | src-4980a6cd48688c360a8c584d07405efb3cfe1fcf.tar.gz | |
Merge third_party/mesa/src from https://chromium.googlesource.com/chromium/deps/mesa.git at e740c825b11773ebe636675977e5f79de253c745
This commit was generated by merge_from_chromium.py.
Change-Id: Ib0311c69f91d994f2c93168dd5fbfaa54d492e95
| -rw-r--r-- | include/c99/stdbool.h | 3 | ||||
| -rw-r--r-- | src/mesa/main/querymatrix.c | 2 | ||||
| -rw-r--r-- | src/mesa/swrast/s_span.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/include/c99/stdbool.h b/include/c99/stdbool.h index 99a735d..99af1a0 100644 --- a/include/c99/stdbool.h +++ b/include/c99/stdbool.h @@ -35,7 +35,8 @@ #define bool _Bool /* For compilers that don't have the builtin _Bool type. */ -#if defined(_MSC_VER) || (__STDC_VERSION__ < 199901L && __GNUC__ < 3) +#if (defined(_MSC_VER) && _MSC_VER < 1800) || \ + (defined __GNUC__&& __STDC_VERSION__ < 199901L && __GNUC__ < 3) typedef unsigned char _Bool; #endif diff --git a/src/mesa/main/querymatrix.c b/src/mesa/main/querymatrix.c index 2843d55..6c456ab 100644 --- a/src/mesa/main/querymatrix.c +++ b/src/mesa/main/querymatrix.c @@ -37,6 +37,7 @@ #define FLOAT_TO_FIXED(x) ((GLfixed) ((x) * 65536.0)) #if defined(_MSC_VER) +#if _MSC_VER < 1800 /* 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. @@ -69,6 +70,7 @@ fpclassify(double x) return FP_NAN; } } +#endif /* _MSC_VER < 1800 */ #elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \ defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \ diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index ef51479..57058ab 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -1330,8 +1330,8 @@ _swrast_write_rgba_span( struct gl_context *ctx, SWspan *span) colorType == GL_FLOAT); /* set span->array->rgba to colors for renderbuffer's datatype */ - if (span->array->ChanType != colorType) { - convert_color_type(span, colorType, 0); + if (span->array->ChanType != colorType || multiFragOutputs) { + convert_color_type(span, colorType, buf); } else { if (span->array->ChanType == GL_UNSIGNED_BYTE) { |