src/rendering/twn_gl_15_rendering.c

@@ -458,7 +458,7 @@ void finally_draw_command(DeferredCommandDraw command) {
     glDepthRange(command.depth_range_low, command.depth_range_high);
 
     /* TODO: cache it for constant parameters, which is a common case */
-    if (command.pipeline == PIPELINE_SPACE && fabsf(0.0f - ctx.game_copy.fog_density) >= 0.00001f) {
+    if (fabsf(0.0f - ctx.game_copy.fog_density) >= 0.00001f) {
         glEnable(GL_FOG);
 
         /* clamp to valid range */

src/twn_textures.c

@@ -41,8 +41,7 @@ static int load_eof_callback(void *user) {
 }
 
 
-static SDL_Surface *missing_texture_surface;
-static uint16_t missing_texture_id;
+static uint8_t *missing_texture_data;
 
 static SDL_Surface *gen_missing_texture_surface(void) {
     Uint32 rmask, gmask, bmask;
@@ -57,23 +56,22 @@ static SDL_Surface *gen_missing_texture_surface(void) {
         bmask = 0x00ff0000;
     #endif
 
-    if (!missing_texture_surface) {
-        uint8_t *data = SDL_malloc(64 * 64 * 3);
-        for (int y = 0; y < 64; ++y) {
+    if (!missing_texture_data) {
+        missing_texture_data = SDL_malloc(64 * 64 * 3);
+        for (int y = 0; y < 64; ++y)
             for (int x = 0; x < 64; ++x) {
                 /* diagonal stripes, chosen so that asked pixel uvs are corresponding to final output */
-                data[(y * 64 + x) * 3 + 0] = (x / 2 + y / 2) % 2 == 0 ? 175 : 0;
-                data[(y * 64 + x) * 3 + 1] = (x / 2 + y / 2) % 2 == 0 ? 0 : 0;
-                data[(y * 64 + x) * 3 + 2] = (x / 2 + y / 2) % 2 == 0 ? 175 : 0;
+                missing_texture_data[(y * 64 + x) * 3 + 0] = (x / 2 + y / 2) % 2 == 0 ? 175 : 0;
+                missing_texture_data[(y * 64 + x) * 3 + 1] = (x / 2 + y / 2) % 2 == 0 ? 0 : 0;
+                missing_texture_data[(y * 64 + x) * 3 + 2] = (x / 2 + y / 2) % 2 == 0 ? 175 : 0;
             }
     }
 
-        missing_texture_surface = SDL_CreateRGBSurfaceFrom(data, 64, 64,
+    /* same data is reused after being allocated/generated once */
+    SDL_Surface *missing_texture_surface = SDL_CreateRGBSurfaceFrom(missing_texture_data, 64, 64,
                                                                     3 * 8,
                                                                     64 * 3,
                                                                     rmask, gmask, bmask, 0);
-    }
-
     return missing_texture_surface;
 }
 
@@ -329,10 +327,8 @@ void textures_cache_deinit(TextureCache *cache) {
 
     /* free cache hashes */
     for (size_t i = 0; i < shlenu(cache->hash); ++i) {
-        if (missing_texture_surface && cache->hash[i].value.data->pixels != missing_texture_surface->pixels)
+        if (cache->hash[i].value.data->pixels != missing_texture_data)
             stbi_image_free(cache->hash[i].value.data->pixels);
-        else
-            SDL_free(cache->hash[i].value.data->pixels);
         SDL_FreeSurface(cache->hash[i].value.data);
     }
     shfree(cache->hash);
@@ -376,9 +372,6 @@ static TextureKey textures_load(TextureCache *cache, const char *path) {
         return (TextureKey){ (uint16_t)i };
 
     SDL_Surface *surface = textures_load_surface(path);
-    if (surface == missing_texture_surface && missing_texture_id != 0)
-        return (TextureKey){ missing_texture_id };
-
     Texture new_texture = {
         .data = surface,
         .mode = infer_texture_mode(surface),
@@ -395,22 +388,13 @@ static TextureKey textures_load(TextureCache *cache, const char *path) {
         new_texture.loner_texture = create_gpu_texture(TEXTURE_FILTER_NEAREAST, true);
         upload_texture_from_surface(new_texture.loner_texture, surface); 
         new_texture.srcrect = (Rect) { .w = (float)surface->w, .h = (float)surface->h };
-
     } else {
         /* will be fully populated as the atlas updates */
         new_texture.atlas_index = cache->atlas_index;
         cache->is_dirty = true;
     }
-
     shput(cache->hash, path, new_texture);
-
-    uint16_t const id = (uint16_t)shlenu(cache->hash) - 1;
-
-    /* reuse this id for every later missing texture */
-    if (surface == missing_texture_surface)
-        missing_texture_id = id;
-
-    return (TextureKey){ id };
+    return (TextureKey){ (uint16_t)shgeti(cache->hash, path) };
 }
 
 
@@ -589,7 +573,7 @@ void textures_bind_repeating(const TextureCache *cache, TextureKey key) {
 
             upload_gpu_texture(repeating_texture,
                                texture.data->pixels,
-                               texture.data->format->BytesPerPixel,
+                               4,
                                texture.data->w,
                                texture.data->h);