diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2014-09-04 15:03:31 +0200 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-09-09 21:28:52 +0100 |
| commit | 92427707243940521fe55bab92a347d3608a5353 (patch) | |
| tree | 7fad5118f465ba763011604694c37bd74804a4a2 /src/mesa | |
| parent | 8e0f72995f9da16607c16f12a294c3a7556a0c15 (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 mesa-stable@lists.freedesktop.org
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
(cherry picked from commit d67db73458c8d66861b97675660289a9555695ce)
[emil velikov: s|consts->|ctx->Const.|]
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
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 9eba1264d20..6b95b60a435 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -647,6 +647,9 @@ _mesa_init_constants(struct gl_context *ctx) /* GL_ARB_framebuffer_object */ ctx->Const.MaxSamples = 0; + /* GLSL default if NativeIntegers == FALSE */ + ctx->Const.UniformBooleanTrue = FLT_AS_UINT(1.0f); + /* GL_ARB_sync */ ctx->Const.MaxServerWaitTimeout = 0x1fff7fffffffULL; diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h index 5228c3a8f28..886e0cdf1c4 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. * |