turn off r_glsl if compilation of the lowest level fallback fails

[xonotic/darkplaces.git] / model_alias.c

diff --git a/model_alias.c b/model_alias.c
index 15e85d068b53c7147bc643238909eadcc09dbcc8..ec808b7060624e1dca68cff9e964b8a556f98bf0 100644 (file)
--- a/model_alias.c
+++ b/model_alias.c
@@ -719,7 +719,7 @@ static void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfi
                                {
                                        if (!Mod_LoadTextureFromQ3Shader(skin, skinfileitem->replacement, false, false, true))
                                        {
-                                               tempskinframe = R_SkinFrame_LoadExternal(skinfileitem->replacement, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, false);
+                                               tempskinframe = R_SkinFrame_LoadExternal(skinfileitem->replacement, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP | TEXF_COMPRESS, false);
                                                if (!tempskinframe)
                                                        if (cls.state != ca_dedicated)
                                                                Con_DPrintf("mesh \"%s\": failed to load skin #%i \"%s\"\n", meshname, i, skinfileitem->replacement);
@@ -740,7 +740,7 @@ static void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfi
        {
                if (!Mod_LoadTextureFromQ3Shader(skin, shadername, false, false, true))
                {
-                       tempskinframe = R_SkinFrame_LoadExternal(shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, false);
+                       tempskinframe = R_SkinFrame_LoadExternal(shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP | TEXF_COMPRESS, false);
                        if (!tempskinframe)
                                if (cls.state != ca_dedicated)
                                        Con_Printf("Can't find texture \"%s\" for mesh \"%s\", using grey checkerboard\n", shadername, meshname);
@@ -783,6 +783,8 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
                Host_Error ("%s has wrong version number (%i should be %i)",
                                 loadmodel->name, version, ALIAS_VERSION);
 
+       loadmodel->modeldatatypestring = "MDL";
+
        loadmodel->type = mod_alias;
        loadmodel->DrawSky = NULL;
        loadmodel->Draw = R_Q1BSP_Draw;
@@ -1016,7 +1018,7 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
                                        sprintf (name, "%s_%i", loadmodel->name, i);
                                if (!Mod_LoadTextureFromQ3Shader(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, name, false, false, true))
                                {
-                                       tempskinframe = R_SkinFrame_LoadExternal(name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP, false);
+                                       tempskinframe = R_SkinFrame_LoadExternal(name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP | TEXF_COMPRESS, false);
                                        if (!tempskinframe)
                                                tempskinframe = R_SkinFrame_LoadInternal(name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_PICMIP, true, r_fullbrights.integer, (unsigned char *)datapointer, skinwidth, skinheight, 8, NULL, NULL);
                                        Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, tempskinframe);
@@ -1028,7 +1030,7 @@ void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend)
                // check for skins that don't exist in the model, but do exist as external images
                // (this was added because yummyluv kept pestering me about support for it)
                // TODO: support shaders here?
-               while ((tempskinframe = R_SkinFrame_LoadExternal(va("%s_%i", loadmodel->name, loadmodel->numskins), (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP, false)))
+               while ((tempskinframe = R_SkinFrame_LoadExternal(va("%s_%i", loadmodel->name, loadmodel->numskins), (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP | TEXF_COMPRESS, false)))
                {
                        // expand the arrays to make room
                        tempskinscenes = loadmodel->skinscenes;
@@ -1100,6 +1102,8 @@ void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
                Host_Error ("%s has wrong version number (%i should be %i)",
                        loadmodel->name, version, MD2ALIAS_VERSION);
 
+       loadmodel->modeldatatypestring = "MD2";
+       
        loadmodel->type = mod_alias;
        loadmodel->DrawSky = NULL;
        loadmodel->Draw = R_Q1BSP_Draw;
@@ -1175,7 +1179,7 @@ void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend)
                {
                        if (!Mod_LoadTextureFromQ3Shader(loadmodel->data_textures + i * loadmodel->num_surfaces, inskin, false, false, true))
                        {
-                               tempskinframe = R_SkinFrame_LoadExternal(inskin, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, false);
+                               tempskinframe = R_SkinFrame_LoadExternal(inskin, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP | TEXF_COMPRESS, false);
                                if (!tempskinframe)
                                        Con_Printf("%s is missing skin \"%s\"\n", loadmodel->name, inskin);
                                Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i * loadmodel->num_surfaces, tempskinframe);
@@ -1333,6 +1337,8 @@ void Mod_IDP3_Load(model_t *mod, void *buffer, void *bufferend)
        if (loadmodel->numskins < 1)
                loadmodel->numskins = 1;
 
+       loadmodel->modeldatatypestring = "MD3";
+
        loadmodel->type = mod_alias;
        loadmodel->DrawSky = NULL;
        loadmodel->Draw = R_Q1BSP_Draw;
@@ -1487,6 +1493,8 @@ void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer, void *bufferend)
        if (BigLong(pinmodel->type) != 1)
                Host_Error ("Mod_ZYMOTICMODEL_Load: only type 1 (skeletal pose) models are currently supported (name = %s)", loadmodel->name);
 
+       loadmodel->modeldatatypestring = "ZYM";
+
        loadmodel->type = mod_alias;
        loadmodel->synctype = ST_RAND;
 
@@ -1797,6 +1805,8 @@ void Mod_DARKPLACESMODEL_Load(model_t *mod, void *buffer, void *bufferend)
        if (BigLong(pheader->type) != 2)
                Host_Error ("Mod_DARKPLACESMODEL_Load: only type 2 (hierarchical skeletal pose) models are currently supported (name = %s)", loadmodel->name);
 
+       loadmodel->modeldatatypestring = "DPM";
+       
        loadmodel->type = mod_alias;
        loadmodel->synctype = ST_RAND;
 
@@ -2097,6 +2107,8 @@ void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
        if (strcmp(pchunk->id, "ACTRHEAD"))
                Host_Error ("Mod_PSKMODEL_Load: %s is not an Unreal Engine ActorX (.psk + .psa) model", loadmodel->name);
 
+       loadmodel->modeldatatypestring = "PSK";
+       
        loadmodel->type = mod_alias;
        loadmodel->DrawSky = NULL;
        loadmodel->Draw = R_Q1BSP_Draw;