diff options
| author | Brian Paul <brianp@vmware.com> | 2009-01-06 14:18:45 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-01-06 14:18:45 -0700 |
| commit | bec14ebf5e4253cdb9e7610273cdd38360394404 (patch) | |
| tree | 66ad0d4a83d2a050dbe2b0d3889bf2cd130a5926 | |
| parent | 22ff5a7a0bad0a9a75a8bcd57e97780c66666249 (diff) | |
mesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)
(cherry picked from commit 8124faf89d638285d8e9aa93adc3ca7f4ee729f3)
Conflicts:
src/mesa/main/get.c
| -rw-r--r-- | src/mesa/main/get.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/get_gen.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index e4910a633e..19cc4806f9 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -2133,7 +2133,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params ) params[0] = (GLfloat)(ctx->DrawBuffer->Visual.depthBits); break; case GL_DEPTH_CLEAR_VALUE: - params[0] = (GLfloat)(ctx->Depth.Clear); + params[0] = ctx->Depth.Clear; break; case GL_DEPTH_FUNC: params[0] = ENUM_TO_FLOAT(ctx->Depth.Func); @@ -3977,7 +3977,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params ) params[0] = ctx->DrawBuffer->Visual.depthBits; break; case GL_DEPTH_CLEAR_VALUE: - params[0] = IROUND(ctx->Depth.Clear); + params[0] = FLOAT_TO_INT(ctx->Depth.Clear); break; case GL_DEPTH_FUNC: params[0] = ENUM_TO_INT(ctx->Depth.Func); diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py index 653deefa72..4c841d05a4 100644 --- a/src/mesa/main/get_gen.py +++ b/src/mesa/main/get_gen.py @@ -179,7 +179,7 @@ StateVars = [ ( "GL_DEPTH_BIAS", GLfloat, ["ctx->Pixel.DepthBias"], "", None ), ( "GL_DEPTH_BITS", GLint, ["ctx->DrawBuffer->Visual.depthBits"], "", None ), - ( "GL_DEPTH_CLEAR_VALUE", GLfloat, ["ctx->Depth.Clear"], "", None ), + ( "GL_DEPTH_CLEAR_VALUE", GLfloatN, ["ctx->Depth.Clear"], "", None ), ( "GL_DEPTH_FUNC", GLenum, ["ctx->Depth.Func"], "", None ), ( "GL_DEPTH_RANGE", GLfloatN, [ "ctx->Viewport.Near", "ctx->Viewport.Far" ], "", None ), |