globally rename model_t to dp_model_t for OpenSolaris. Sorry, guys who now have svn...

[xonotic/darkplaces.git] / vid_wgl.c

diff --git a/vid_wgl.c b/vid_wgl.c
index 36520ee2cb57368c34d9e068da704814ec00df8f..3884cb07a21359c02ef556cc8ba3e679b4d4aa7c 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -527,7 +527,7 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
                        GetKeyboardState (state);
                        // alt/ctrl/shift tend to produce funky ToAscii values,
                        // and if it's not a single character we don't know care about it
-                       charlength = ToAscii (wParam, lParam >> 16, state, (unsigned short *)asciichar, 0);
+                       charlength = ToAscii (wParam, lParam >> 16, state, (LPWORD)asciichar, 0);
                        if (vkey == K_ALT || vkey == K_CTRL || vkey == K_SHIFT || charlength == 0)
                                asciichar[0] = 0;
                        else if( charlength == 2 ) {
@@ -843,13 +843,21 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
        // if stencil is enabled, ask for alpha too
        if (bpp >= 32)
        {
-               pfd.cStencilBits = 8;
+               pfd.cRedBits = 8;
+               pfd.cGreenBits = 8;
+               pfd.cBlueBits = 8;
                pfd.cAlphaBits = 8;
+               pfd.cDepthBits = 24;
+               pfd.cStencilBits = 8;
        }
        else
        {
-               pfd.cStencilBits = 0;
+               pfd.cRedBits = 5;
+               pfd.cGreenBits = 5;
+               pfd.cBlueBits = 5;
                pfd.cAlphaBits = 0;
+               pfd.cDepthBits = 16;
+               pfd.cStencilBits = 0;
        }
 
        if (stereobuffer)
@@ -873,7 +881,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
                *a++ = WGL_BLUE_BITS_ARB;
                *a++ = 8;
                *a++ = WGL_ALPHA_BITS_ARB;
-               *a++ = 1;
+               *a++ = 8;
                *a++ = WGL_DEPTH_BITS_ARB;
                *a++ = 24;
                *a++ = WGL_STENCIL_BITS_ARB;
@@ -1087,8 +1095,12 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
 
        pixelformat = 0;
        newpixelformat = 0;
-       for (windowpass = 0;windowpass < 2;windowpass++)
+       // start out at the final windowpass if samples is 1 as it's the only feature we need extended pixel formats for
+       for (windowpass = samples == 1;windowpass < 2;windowpass++)
        {
+               gl_extensions = "";
+               gl_platformextensions = "";
+
                mainwindow = CreateWindowEx (ExWindowStyle, "DarkPlacesWindowClass", gamename, WindowStyle, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, global_hInstance, NULL);
                if (!mainwindow)
                {
@@ -1146,15 +1158,20 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int refreshrat
                if ((qwglGetExtensionsStringARB = (const char *(WINAPI *)(HDC hdc))GL_GetProcAddress("wglGetExtensionsStringARB")) == NULL)
                        Con_Print("wglGetExtensionsStringARB not found\n");
 
-               gl_renderer = qglGetString(GL_RENDERER);
-               gl_vendor = qglGetString(GL_VENDOR);
-               gl_version = qglGetString(GL_VERSION);
-               gl_extensions = qglGetString(GL_EXTENSIONS);
+               gl_renderer = (const char *)qglGetString(GL_RENDERER);
+               gl_vendor = (const char *)qglGetString(GL_VENDOR);
+               gl_version = (const char *)qglGetString(GL_VERSION);
+               gl_extensions = (const char *)qglGetString(GL_EXTENSIONS);
                gl_platform = "WGL";
                gl_platformextensions = "";
 
                if (qwglGetExtensionsStringARB)
-                       gl_platformextensions = qwglGetExtensionsStringARB(baseDC);
+                       gl_platformextensions = (const char *)qwglGetExtensionsStringARB(baseDC);
+
+               if (!gl_extensions)
+                       gl_extensions = "";
+               if (!gl_platformextensions)
+                       gl_platformextensions = "";
 
                // now some nice Windows pain:
                // we have created a window, we needed one to find out if there are