summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2008-09-23 17:24:39 -0700
committerKeith Whitwell <keith@tungstengraphics.com>2008-09-23 17:24:39 -0700
commit62dd7575f07f3ff9803118113746dba9219c1390 (patch)
treef59a65be187030739f409ae05432a025c2603789 /src
parent2cb3d2b7a0d8f505131e98053d3e19982012fccd (diff)
parent452a592ca4b1bac78eee53fb9f2f1deac7832840 (diff)
Merge commit 'origin/master' into gallium-0.2
Conflicts: src/mesa/main/drawpix.c src/mesa/shader/prog_uniform.c src/mesa/shader/slang/slang_link.c
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/get.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index ae6afef17d..5202c3ddac 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -2137,7 +2137,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
params[0] = (GLfloat)(ctx->DrawBuffer->Visual.depthBits);
break;
case GL_DEPTH_CLEAR_VALUE:
- params[0] = ctx->Depth.Clear;
+ params[0] = (GLfloat)ctx->Depth.Clear;
break;
case GL_DEPTH_FUNC:
params[0] = ENUM_TO_FLOAT(ctx->Depth.Func);
@@ -2940,7 +2940,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
GLuint i, n = _mesa_get_compressed_formats(ctx, formats, GL_FALSE);
ASSERT(n <= 100);
for (i = 0; i < n; i++)
- params[i] = ENUM_TO_INT(formats[i]);
+ params[i] = (GLfloat)(ENUM_TO_INT(formats[i]));
}
break;
case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT: