Skip to content

Exempt user bitmaps from texture detail culling #7617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Goober5000 merged 2 commits into from
Jul 19, 2026
+20 −5
Merged

Exempt user bitmaps from texture detail culling #7617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61a217c
Exempt user bitmaps from texture detail culling
Goober5000 Jul 18, 2026
35312d3
Check texture bind results in the volumetric nebula pass
Goober5000 Jul 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions code/graphics/opengl/gropengldeferred.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,12 +605,16 @@ void gr_opengl_deferred_lighting_finish()
float u_scale, v_scale;
uint32_t array_index;
gr_set_texture_addressing(TMAP_ADDRESS_CLAMP);
gr_opengl_tcache_set(neb.getVolumeBitmapHandle(), TCACHE_TYPE_3DTEX, &u_scale, &v_scale, &array_index, 3);
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
// only set the filter parameter if the bind succeeded, or else it is applied to whatever
// texture was previously bound to this unit
if (gr_opengl_tcache_set(neb.getVolumeBitmapHandle(), TCACHE_TYPE_3DTEX, &u_scale, &v_scale, &array_index, 3)) {
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
}
if (neb.getNoiseActive()) {
gr_set_texture_addressing(TMAP_ADDRESS_WRAP);
gr_opengl_tcache_set(neb.getNoiseVolumeBitmapHandle(), TCACHE_TYPE_3DTEX, &u_scale, &v_scale, &array_index, 4);
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
if (gr_opengl_tcache_set(neb.getNoiseVolumeBitmapHandle(), TCACHE_TYPE_3DTEX, &u_scale, &v_scale, &array_index, 4)) {
glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
}
}
}

Expand Down
13 changes: 12 additions & 1 deletion code/graphics/opengl/gropengltexture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,11 @@ int opengl_create_texture(int bitmap_handle, int bitmap_type, tcache_slot_opengl

auto base_level = 0;
auto resize = false;
if ( (Detail.hardware_textures < 4) && (bitmap_type != TCACHE_TYPE_AABITMAP) && (bitmap_type != TCACHE_TYPE_INTERFACE)
// User bitmaps are excluded from culling because they are streaming surfaces (e.g. animations and
// video) that are updated through gr_update_texture() with the bitmap's own dimensions each frame,
// which requires the texture to match the bitmap's size.
if ( (Detail.hardware_textures < 4) && (bm_get_type(bitmap_handle) != BM_TYPE_USER)
&& (bitmap_type != TCACHE_TYPE_AABITMAP) && (bitmap_type != TCACHE_TYPE_INTERFACE)
&& (bitmap_type != TCACHE_TYPE_CUBEMAP) && (bitmap_type != TCACHE_TYPE_3DTEX)
&& ((bitmap_type != TCACHE_TYPE_COMPRESSED) || ((bitmap_type == TCACHE_TYPE_COMPRESSED) && (max_levels > 1))) )
{
Expand Down Expand Up @@ -1565,6 +1569,13 @@ void gr_opengl_update_texture(int bitmap_handle, int bpp, const ubyte* data, int
auto t = bm_get_gr_info<tcache_slot_opengl>(bitmap_handle);
if(!t->texture_id)
return;

// This overwrites the texture with data at the bitmap's own size, so the texture must not have been
// culled when it was created (user bitmaps are exempt from texture detail culling for this reason).
Assertion((t->w == width) && (t->h == height),
"gr_opengl_update_texture() called for bitmap %s with %dx%d data, but its texture is %dx%d.",
bm_get_filename(bitmap_handle), width, height, t->w, t->h);

int byte_mult = (bpp >> 3);
int true_byte_mult = (t->bpp >> 3);
ubyte* texmem = NULL;
Expand Down
Loading