mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed GLSL optimizer Android build.

Browse Source
This commit is contained in:
bkaradzic 2013-12-30 15:56:55 -08:00
parent 2e0952bbec
commit 82d6813c5c
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/glsl-optimizer/src/glsl/glsl_types.cpp vendored
View File

@ -586,7 +586,7 @@ glsl_type::field_type(const char *name) const
return error_type; return error_type;
} }
const glsl_precision glsl_precision
glsl_type::field_precision(const char *name) const glsl_type::field_precision(const char *name) const
{ {
if (this->base_type != GLSL_TYPE_STRUCT) if (this->base_type != GLSL_TYPE_STRUCT)

2
3rdparty/glsl-optimizer/src/glsl/glsl_types.h vendored
View File

@ -454,7 +454,7 @@ struct glsl_type {
*/ */
const glsl_type *field_type(const char *name) const; const glsl_type *field_type(const char *name) const;
const glsl_precision field_precision(const char *name) const; glsl_precision field_precision(const char *name) const;
/** /**

2
3rdparty/glsl-optimizer/src/glsl/ralloc.c vendored
View File

@ -29,7 +29,7 @@
#include <stdint.h> #include <stdint.h>
/* Android defines SIZE_MAX in limits.h, instead of the standard stdint.h */ /* Android defines SIZE_MAX in limits.h, instead of the standard stdint.h */
#ifdef ANDROID #if defined(__ANDROID__) || defined(ANDROID)
#include <limits.h> #include <limits.h>
#endif #endif

2
3rdparty/glsl-optimizer/src/glsl/strtod.c vendored
View File

@ -45,7 +45,7 @@ double
glsl_strtod(const char *s, char **end) glsl_strtod(const char *s, char **end)
{ {
#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \ #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
!defined(__HAIKU__) && !defined(__UCLIBC__) !defined(__HAIKU__) && !defined(__UCLIBC__) && !defined(__ANDROID__)
static locale_t loc = NULL; static locale_t loc = NULL;
if (!loc) { if (!loc) {
loc = newlocale(LC_CTYPE_MASK, "C", NULL); loc = newlocale(LC_CTYPE_MASK, "C", NULL);

2
3rdparty/glsl-optimizer/src/mesa/main/imports.h vendored
View File

@ -114,7 +114,7 @@ typedef union { GLfloat f; GLint i; } fi_type;
#define floorf(f) ((float) floor(f)) #define floorf(f) ((float) floor(f))
#define logf(f) ((float) log(f)) #define logf(f) ((float) log(f))
#ifdef ANDROID #if defined(__ANDROID__) || defined(ANDROID)
#define log2f(f) (logf(f) * (float) (1.0 / M_LN2)) #define log2f(f) (logf(f) * (float) (1.0 / M_LN2))
#else #else
#define log2f(f) ((float) log2(f)) #define log2f(f) ((float) log2(f))