fix compile problem on win32

[xonotic/darkplaces.git] / vid_wgl.c

diff --git a/vid_wgl.c b/vid_wgl.c
index 81e45c3b84666b556b29bb9db612bb784f2c50e4..9129377a1dae264d4690f947b085b623d419b425 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -1546,8 +1546,6 @@ qboolean VID_InitModeDX(viddef_mode_t *mode, int version)
        memset(&vid.support, 0, sizeof(vid.support));
        Cvar_SetQuick(&gl_info_extensions, "");
 
-       CHECKGLERROR
-
        vid.forcevbo = false;
        vid.support.arb_depth_texture = true;
        vid.support.arb_draw_buffers = vid_d3d9caps.NumSimultaneousRTs > 1;
@@ -1579,6 +1577,7 @@ qboolean VID_InitModeDX(viddef_mode_t *mode, int version)
        vid.texarrayunits = bound(8, vid.texarrayunits, MAX_TEXTUREUNITS);
        Con_DPrintf("Using D3D9.0 rendering path - %i texture matrix, %i texture images, %i texcoords, shadowmapping supported%s\n", vid.texunits, vid.teximageunits, vid.texarrayunits, vid.maxdrawbuffers > 1 ? ", MRT detected (allows prepass deferred lighting)" : "");
        vid.renderpath = RENDERPATH_D3D9;
+       vid.useinterleavedarrays = true;
 
        Cvar_SetQuick(&gl_info_vendor, gl_vendor);
        Cvar_SetQuick(&gl_info_renderer, gl_renderer);
@@ -2198,7 +2197,7 @@ int IN_JoystickGetAxisNum(int ControlListType)
        int i;
 
        for (i = 0; i < JOY_MAX_AXES; i++)
-               if (dwAxisMap[i] == ControlListType)
+               if (dwAxisMap[i] == (DWORD) ControlListType)
                        return i;
        return -1;
 }