fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge commit 'origin/master' into gallium-0.2

Browse source 
Conflicts:

	src/mesa/main/drawpix.c
	src/mesa/shader/prog_uniform.c
	src/mesa/shader/slang/slang_link.c
This commit is contained in:
Keith Whitwell 2008-09-23 17:24:39 -07:00
commit 62dd7575f0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/main/get.c
View file

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