Merge remote branch 'origin/mesa_7_6_branch'

[mesa.git] / src / mesa / drivers / windows / gldirect / dglcontext.c

diff --git a/src/mesa/drivers/windows/gldirect/dglcontext.c b/src/mesa/drivers/windows/gldirect/dglcontext.c
index c504be58ace47760591f640587c36c0375968b92..e9c23d1ccb034be69bb2b3e9cc3b82893649d238 100644 (file)
--- a/src/mesa/drivers/windows/gldirect/dglcontext.c
+++ b/src/mesa/drivers/windows/gldirect/dglcontext.c
@@ -37,7 +37,7 @@
 #include "dglcontext.h"
 
 // Get compile errors without this. KeithH
-#include "scitech.h"   // ibool, etc.
+//#include "scitech.h" // ibool, etc.
 
 #ifdef _USE_GLD3_WGL
 #include "gld_driver.h"
@@ -517,12 +517,12 @@ LRESULT CALLBACK dglKeyProc(
        HGLRC hGLRC = NULL;
        DGL_ctx* lpCtx = NULL;
        int cmd = 0, dx1 = 0, dx2 = 0, i;
-       static ibool bAltPressed = false;
-       static ibool bCtrlPressed = false;
-       static ibool bShiftPressed = false;
+       static BOOL bAltPressed = FALSE;
+       static BOOL bCtrlPressed = FALSE;
+       static BOOL bShiftPressed = FALSE;
     RECT r, rf, rc;
     POINT pt;
-    ibool bForceReshape = false;
+    BOOL bForceReshape = FALSE;
 
        return CallNextHookEx(hKeyHook, code, wParam, lParam);
 }
@@ -1453,7 +1453,7 @@ SkipPrimaryCreate:
 #ifdef _USE_GLD3_WGL
        // Init Mesa internals
        _swrast_CreateContext( lpCtx->glCtx );
-       _ac_CreateContext( lpCtx->glCtx );
+       _vbo_CreateContext( lpCtx->glCtx );
        _tnl_CreateContext( lpCtx->glCtx );
        _swsetup_CreateContext( lpCtx->glCtx );
 
@@ -1482,6 +1482,7 @@ SkipPrimaryCreate:
 #else
        lpCtx->glCtx->Const.MaxTextureSize = 1024;
 #endif
+       lpCtx->glCtx->Const.MaxDrawBuffers = 1;
 
        // Setup the Display Driver pointers
        dglSetupDDPointers(lpCtx->glCtx);