Squashed commit of the following:

[xonotic/darkplaces.git] / vid_sdl.c

diff --git a/vid_sdl.c b/vid_sdl.c
index 5c9ee27efebd05d7dd9fbd79320d3e463c2a0839..0af682106c132b50912443dcab2e3776eee2d072 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -1192,7 +1192,7 @@ qboolean VID_InitModeSoft(viddef_mode_t *mode)
        vid.support.arb_draw_buffers = true;
        vid.support.arb_occlusion_query = true;
        vid.support.arb_shadow = true;
-       vid.support.arb_texture_compression = true;
+       //vid.support.arb_texture_compression = true;
        vid.support.arb_texture_cube_map = true;
        vid.support.arb_texture_non_power_of_two = false;
        vid.support.arb_vertex_buffer_object = true;
@@ -1200,7 +1200,7 @@ qboolean VID_InitModeSoft(viddef_mode_t *mode)
        vid.support.ext_draw_range_elements = true;
        vid.support.ext_framebuffer_object = true;
        vid.support.ext_texture_3d = true;
-       vid.support.ext_texture_compression_s3tc = true;
+       //vid.support.ext_texture_compression_s3tc = true;
        vid.support.ext_texture_filter_anisotropic = true;
        vid.support.ati_separate_stencil = true;
 
@@ -1262,9 +1262,11 @@ qboolean VID_InitMode(viddef_mode_t *mode)
 {
        if (!SDL_WasInit(SDL_INIT_VIDEO) && SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
                Sys_Error ("Failed to init SDL video subsystem: %s", SDL_GetError());
+#ifdef SSE2_PRESENT
        if (vid_soft.integer)
                return VID_InitModeSoft(mode);
        else
+#endif
                return VID_InitModeGL(mode);
 }