Mirrors/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-12-28 05:24:00 +00:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Fix regression caused by PR 18151 (#18454)

Browse Source 
(cherry picked from commit 6885cc449532020f41dfcb5bf92bd7f4299f1bdf)
This commit is contained in:
刘皓 2025-11-28 23:13:33 -05:00 committed by GitHub
parent 0d913aab7a
commit 35c5c51d4e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
gfx/drivers/gl3.c
View File

@ -3792,35 +3792,6 @@ static bool gl3_frame(void *data, const void *frame,
gl->textures_index = (gl->textures_index + 1)
& (GL_CORE_NUM_TEXTURES - 1);
streamed = &gl->textures[gl->textures_index];
texture.image = 0;
texture.width = streamed->width;
texture.height = streamed->height;
texture.padded_width = 0;
texture.padded_height = 0;
texture.format = 0;
if (gl->flags & GL3_FLAG_HW_RENDER_ENABLE)
{
texture.image = gl->hw_render_texture;
texture.format = GL_RGBA8;
texture.padded_width = gl->hw_render_max_width;
texture.padded_height = gl->hw_render_max_height;
if (texture.width == 0)
texture.width = 1;
if (texture.height == 0)
texture.height = 1;
}
else
{
texture.image = streamed->tex;
texture.format = gl->video_info.rgb32 ? GL_RGBA8 : GL_RGB565;
texture.padded_width = streamed->width;
texture.padded_height = streamed->height;
}
/* Render to texture in first pass. */
if (gl->chain.active && gl->chain.num_fbo_passes != 0)
{
@ -3831,6 +3802,7 @@ static bool gl3_frame(void *data, const void *frame,
gl3_renderchain_start_render(gl);
}
streamed = &gl->textures[gl->textures_index];
if (frame)
{
if (gl->flags & GL3_FLAG_HW_RENDER_ENABLE)
@ -3839,22 +3811,8 @@ static bool gl3_frame(void *data, const void *frame,
streamed->height = frame_height;
}
else
{
if (gl->chain.active)
gl3_update_input_size(gl, frame_width, frame_height);
gl3_update_cpu_texture(gl, streamed, frame,
frame_width, frame_height, pitch);
}
/* No point regenerating mipmaps
* if there are no new frames. */
if (gl->chain.active && gl->chain.mipmap_active)
{
glBindTexture(GL_TEXTURE_2D, texture.image);
glGenerateMipmap(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, 0);
}
}
if (gl->flags & GL3_FLAG_SHOULD_RESIZE)
@ -3920,6 +3878,49 @@ static bool gl3_frame(void *data, const void *frame,
gl3_set_viewport(gl, width, height, false, true);
}
/* Can be NULL for frame dupe / NULL render. */
if (frame && gl->chain.active)
{
if (!(gl->flags & GL3_FLAG_HW_RENDER_ENABLE))
gl3_update_input_size(gl, frame_width, frame_height);
/* No point regenerating mipmaps
* if there are no new frames. */
if (gl->chain.mipmap_active)
{
glBindTexture(GL_TEXTURE_2D, texture.image);
glGenerateMipmap(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, 0);
}
}
texture.image = 0;
texture.width = streamed->width;
texture.height = streamed->height;
texture.padded_width = 0;
texture.padded_height = 0;
texture.format = 0;
if (gl->flags & GL3_FLAG_HW_RENDER_ENABLE)
{
texture.image = gl->hw_render_texture;
texture.format = GL_RGBA8;
texture.padded_width = gl->hw_render_max_width;
texture.padded_height = gl->hw_render_max_height;
if (texture.width == 0)
texture.width = 1;
if (texture.height == 0)
texture.height = 1;
}
else
{
texture.image = streamed->tex;
texture.format = gl->video_info.rgb32 ? GL_RGBA8 : GL_RGB565;
texture.padded_width = streamed->width;
texture.padded_height = streamed->height;
}
if (gl->chain.active)
{
video_shader_ctx_params_t params;