mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-08-28 09:31:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Copy shader params instead of caching a pointer to them

Browse Source 
It's possible for a new texture to be allocated with the same address as a previous one, so we can't just cache the pointer value.

Fixes https://github.com/libsdl-org/SDL/issues/14369
This commit is contained in:
Sam Lantinga
2025-11-01 10:24:01 -07:00
parent 3a59163614
commit aafbf7183f
3 changed files with 57 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/render/opengl/SDL_render_gl.c
View File

@@ -1671,6 +1671,7 @@ static void GL_DestroyTexture(SDL_Renderer *renderer, SDL_Texture *texture)
if (renderdata->drawstate.texture == texture) {
renderdata->drawstate.texture = NULL;
renderdata->drawstate.shader_params = NULL;
}
if (renderdata->drawstate.target == texture) {
renderdata->drawstate.target = NULL;

27
src/render/opengl/SDL_shaders_gl.c
View File

@@ -59,7 +59,7 @@ struct GL_ShaderContext
bool GL_ARB_texture_rectangle_supported;
GL_ShaderData shaders[NUM_SHADERS];
const float *shader_params[NUM_SHADERS];
float *shader_params[NUM_SHADERS];
};
/* *INDENT-OFF* */ // clang-format off
@@ -703,7 +703,22 @@ void GL_SelectShader(GL_ShaderContext *ctx, GL_Shader shader, const float *shade
ctx->glUseProgramObjectARB(program);
if (shader_params && shader_params != ctx->shader_params[shader]) {
int shader_params_len = 0;
if (shader == SHADER_PALETTE_LINEAR ||
shader == SHADER_PALETTE_PIXELART ||
shader == SHADER_RGB_PIXELART ||
shader == SHADER_RGBA_PIXELART) {
shader_params_len = 4 * sizeof(float);
#ifdef SDL_HAVE_YUV
} else if (shader >= SHADER_YUV) {
shader_params_len = 16 * sizeof(float);
#endif
}
SDL_assert(!shader_params || shader_params_len > 0);
if (shader_params &&
(!ctx->shader_params[shader] ||
SDL_memcmp(shader_params, ctx->shader_params[shader], shader_params_len) != 0)) {
if (shader == SHADER_PALETTE_LINEAR ||
shader == SHADER_PALETTE_PIXELART ||
shader == SHADER_RGB_PIXELART ||
@@ -736,7 +751,12 @@ void GL_SelectShader(GL_ShaderContext *ctx, GL_Shader shader, const float *shade
}
#endif // SDL_HAVE_YUV
ctx->shader_params[shader] = shader_params;
if (!ctx->shader_params[shader]) {
ctx->shader_params[shader] = (float *)SDL_malloc(shader_params_len);
}
if (ctx->shader_params[shader]) {
SDL_memcpy(ctx->shader_params[shader], shader_params, shader_params_len);
}
}
}
@@ -746,6 +766,7 @@ void GL_DestroyShaderContext(GL_ShaderContext *ctx)
for (i = 0; i < NUM_SHADERS; ++i) {
DestroyShaderProgram(ctx, &ctx->shaders[i]);
SDL_free(ctx->shader_params[i]);
}
SDL_free(ctx);
}