From: Brian Paul <brianp@vmware.com>
Date: Thu, 5 Nov 2009 00:57:20 +0000 (-0700)
Subject: Merge branch 'mesa_7_6_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=898de4a9d5e47ed32c600e5907476fd9338aa7e9;p=mesa.git

Merge branch 'mesa_7_6_branch'

Conflicts:

	src/mesa/drivers/windows/gdi/mesa.def
---

898de4a9d5e47ed32c600e5907476fd9338aa7e9
diff --cc src/mesa/main/get.c
index a6e004a8166,604b1062177..6c5ce029135
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@@ -7228,12 -7216,8 +7228,12 @@@ _mesa_GetInteger64v( GLenum pname, GLin
           params[0] = IROUND64(ctx->Depth.BoundsMin);
           params[1] = IROUND64(ctx->Depth.BoundsMax);
           break;
 +      case GL_DEPTH_CLAMP:
 +         CHECK_EXT1(ARB_depth_clamp, "GetInteger64v");
 +         params[0] = BOOLEAN_TO_INT64(ctx->Transform.DepthClamp);
 +         break;
        case GL_MAX_DRAW_BUFFERS_ARB:
-          params[0] = ctx->Const.MaxDrawBuffers;
+          params[0] = (GLint64)(ctx->Const.MaxDrawBuffers);
           break;
        case GL_DRAW_BUFFER0_ARB:
           params[0] = ENUM_TO_INT64(ctx->DrawBuffer->ColorDrawBuffer[0]);