diff options
| author | Marek Olšák <[email protected]> | 2014-09-04 15:03:31 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2014-09-05 15:41:47 +0200 |
| commit | d67db73458c8d66861b97675660289a9555695ce (patch) | |
| tree | 99cefc0acd1fabffd92e3043fd52f29c159581c3 /src/mesa | |
| parent | 635477dc4b9579dac2fc0fb332dcf2e0e48dd418 (diff) | |
mesa: set UniformBooleanTrue = 1.0f by default
because NativeIntegers is 0 by default.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82882
Cc: 10.2 10.3 [email protected]
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/context.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/macros.h | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index fbdbd680a2e..8b5693e3771 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -653,6 +653,9 @@ _mesa_init_constants(struct gl_constants *consts, gl_api api) /* GL_ARB_framebuffer_object */ consts->MaxSamples = 0; + /* GLSL default if NativeIntegers == FALSE */ + consts->UniformBooleanTrue = FLT_AS_UINT(1.0f); + /* GL_ARB_sync */ consts->MaxServerWaitTimeout = 0x1fff7fffffffULL; diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h index 422eb5aadaa..7b6148d0940 100644 --- a/src/mesa/main/macros.h +++ b/src/mesa/main/macros.h @@ -184,6 +184,13 @@ static inline GLfloat UINT_AS_FLT(GLuint u) return tmp.f; } +static inline unsigned FLT_AS_UINT(float f) +{ + fi_type tmp; + tmp.f = f; + return tmp.u; +} + /** * Convert a floating point value to an unsigned fixed point value. * |