Browse Source

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>
tags/10.4-branchpoint
Marek Olšák 11 years ago
parent
commit
d67db73458
2 changed files with 10 additions and 0 deletions
  1. 3
    0
      src/mesa/main/context.c
  2. 7
    0
      src/mesa/main/macros.h

+ 3
- 0
src/mesa/main/context.c View File

@@ -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;


+ 7
- 0
src/mesa/main/macros.h View File

@@ -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.
*

Loading…
Cancel
Save