Skip to content

Revert mipmap generation on render targets from 66a7657 #18731

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
LibretroAdmin merged 1 commit into from
Feb 14, 2026
+34 −61
Merged

Revert mipmap generation on render targets from 66a7657 #18731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 2 additions & 8 deletions gfx/drivers/d3d10.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,8 +406,8 @@ static void d3d10_init_texture(D3D10Device device, d3d10_texture_t* texture)
unsigned width, height;

texture->desc.BindFlags |= D3D10_BIND_RENDER_TARGET;
width = texture->desc.Width;
height = texture->desc.Height;
width = texture->desc.Width >> 5;
height = texture->desc.Height >> 5;

while ((width > 1) || (height > 1))
{
Expand Down Expand Up @@ -2378,7 +2378,6 @@ static void d3d10_init_render_targets(d3d10_video_t* d3d10,
d3d10->pass[i].rt.desc.BindFlags = D3D10_BIND_RENDER_TARGET;
d3d10->pass[i].rt.desc.Format = glslang_format_to_dxgi(
d3d10->pass[i].semantics.format);
d3d10->pass[i].rt.desc.MiscFlags = D3D10_RESOURCE_MISC_GENERATE_MIPS;
d3d10_release_texture(&d3d10->pass[i].rt);
d3d10_init_texture(d3d10->device, &d3d10->pass[i].rt);

Expand Down Expand Up @@ -2721,11 +2720,6 @@ static bool d3d10_gfx_frame(
#endif /* D3D10_ROLLING_SCANLINE_SIMULATION */

context->lpVtbl->Draw(context, 4, 0);

/* Generate mipmaps for render target if needed */
if (d3d10->pass[i].rt.desc.MiscFlags & D3D10_RESOURCE_MISC_GENERATE_MIPS)
context->lpVtbl->GenerateMips(context, d3d10->pass[i].rt.view);

texture = &d3d10->pass[i].rt;
}
else
Expand Down
12 changes: 2 additions & 10 deletions gfx/drivers/d3d11.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,9 +579,8 @@ static void d3d11_init_texture(D3D11Device device, d3d11_texture_t* texture)
unsigned width, height;

texture->desc.BindFlags |= D3D11_BIND_RENDER_TARGET;
width = texture->desc.Width;
height = texture->desc.Height;
texture->desc.MipLevels = 1;
width = texture->desc.Width >> 5;
height = texture->desc.Height >> 5;

while ((width > 1) || (height > 1))
{
Expand Down Expand Up @@ -3226,13 +3225,10 @@ static void d3d11_init_render_targets(d3d11_video_t* d3d11, unsigned width, unsi
d3d11->pass[i].viewport.Width = width;
d3d11->pass[i].viewport.Height = height;
d3d11->pass[i].viewport.MaxDepth = 1.0;

d3d11->pass[i].rt.desc.Width = width;
d3d11->pass[i].rt.desc.Height = height;
d3d11->pass[i].rt.desc.BindFlags = D3D11_BIND_RENDER_TARGET;
d3d11->pass[i].rt.desc.Format = glslang_format_to_dxgi(d3d11->pass[i].semantics.format);
d3d11->pass[i].rt.desc.MiscFlags = D3D11_RESOURCE_MISC_GENERATE_MIPS;

d3d11_release_texture(&d3d11->pass[i].rt);
d3d11_init_texture(d3d11->device, &d3d11->pass[i].rt);

Expand Down Expand Up @@ -3728,10 +3724,6 @@ static bool d3d11_gfx_frame(
else
context->lpVtbl->Draw(context, 4, 4);

/* Generate mipmaps for render target if needed */
if (d3d11->pass[i].rt.desc.MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS)
context->lpVtbl->GenerateMips(context, d3d11->pass[i].rt.view);

texture = &d3d11->pass[i].rt;
}
}
Expand Down
73 changes: 30 additions & 43 deletions gfx/drivers/d3d12.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,11 +726,11 @@ static void d3d12_init_texture(D3D12Device device, d3d12_texture_t* texture)
if (!texture->desc.MipLevels)
texture->desc.MipLevels = 1;

/* Calculate mipmap count */
if (texture->desc.Width > 1 || texture->desc.Height > 1)
if ( !(texture->desc.Width >> (texture->desc.MipLevels - 1))
&& !(texture->desc.Height >> (texture->desc.MipLevels - 1)))
{
unsigned width = texture->desc.Width;
unsigned height = texture->desc.Height;
unsigned width = texture->desc.Width >> 5;
unsigned height = texture->desc.Height >> 5;
texture->desc.MipLevels = 1;
while ((width > 1) || (height > 1))
{
Expand Down Expand Up @@ -846,11 +846,33 @@ static void d3d12_init_texture(D3D12Device device, d3d12_texture_t* texture)
texture->size_data.w = 1.0f / texture->desc.Height;
}

static void d3d12_generate_mipmaps(
D3D12GraphicsCommandList cmd,
d3d12_texture_t* texture,
void *userdata)
static void d3d12_upload_texture(D3D12GraphicsCommandList cmd,
d3d12_texture_t* texture, void *userdata)
{
D3D12_TEXTURE_COPY_LOCATION src, dst;

src.pResource = texture->upload_buffer;
src.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT;
src.PlacedFootprint = texture->layout;

dst.pResource = texture->handle;
dst.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
dst.SubresourceIndex = 0;

D3D12_RESOURCE_TRANSITION(
cmd,
texture->handle,
D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE,
D3D12_RESOURCE_STATE_COPY_DEST);

cmd->lpVtbl->CopyTextureRegion(cmd, &dst, 0, 0, 0, &src, NULL);

D3D12_RESOURCE_TRANSITION(
cmd,
texture->handle,
D3D12_RESOURCE_STATE_COPY_DEST,
D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);

if (texture->desc.MipLevels > 1)
{
unsigned i;
Expand Down Expand Up @@ -906,36 +928,6 @@ static void d3d12_generate_mipmaps(
}
}
}
}

static void d3d12_upload_texture(D3D12GraphicsCommandList cmd,
d3d12_texture_t* texture, void *userdata)
{
D3D12_TEXTURE_COPY_LOCATION src, dst;

src.pResource = texture->upload_buffer;
src.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT;
src.PlacedFootprint = texture->layout;

dst.pResource = texture->handle;
dst.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX;
dst.SubresourceIndex = 0;

D3D12_RESOURCE_TRANSITION(
cmd,
texture->handle,
D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE,
D3D12_RESOURCE_STATE_COPY_DEST);

cmd->lpVtbl->CopyTextureRegion(cmd, &dst, 0, 0, 0, &src, NULL);

D3D12_RESOURCE_TRANSITION(
cmd,
texture->handle,
D3D12_RESOURCE_STATE_COPY_DEST,
D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);

d3d12_generate_mipmaps(cmd, texture, userdata);

texture->dirty = false;
}
Expand Down Expand Up @@ -3776,8 +3768,6 @@ static void d3d12_init_render_targets(d3d12_video_t* d3d12, unsigned width, unsi
d3d12->pass[i].rt.desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
d3d12->pass[i].rt.srv_heap = &d3d12->desc.srv_heap;
d3d12->pass[i].rt.desc.Format = glslang_format_to_dxgi(d3d12->pass[i].semantics.format);
/* Initialize MipLevels so mipmaps are created for render target */
d3d12->pass[i].rt.desc.MipLevels = 0;
d3d12_release_texture(&d3d12->pass[i].rt);
d3d12_init_texture(d3d12->device, &d3d12->pass[i].rt);

Expand Down Expand Up @@ -4424,9 +4414,6 @@ static bool d3d12_gfx_frame(
D3D12_RESOURCE_STATE_RENDER_TARGET,
D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);

/* Generate mipmaps for framebuffer if it has multiple mipmap levels */
d3d12_generate_mipmaps(cmd, &d3d12->pass[i].rt, d3d12);

D3D12_RESOURCE_TRANSITION(
cmd,
d3d12->pass[i].rt.handle,
Expand Down
Loading