From 02faa8f75c96cb21daa89d509582633d72993400 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Fri, 14 Mar 2025 09:18:34 -0700
Subject: [PATCH] Rename SDL_SetGPURenderStateFragmentUniformData() to
SDL_SetGPURenderStateFragmentUniforms()
---
include/SDL3/SDL_render.h | 6 +++---
src/dynapi/SDL_dynapi.sym | 2 +-
src/dynapi/SDL_dynapi_overrides.h | 2 +-
src/dynapi/SDL_dynapi_procs.h | 2 +-
src/render/SDL_render.c | 2 +-
test/testgpurender_effects.c | 2 +-
test/testgpurender_msdf.c | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/include/SDL3/SDL_render.h b/include/SDL3/SDL_render.h
index 242556c127bdb..3019ed0df2b5a 100644
--- a/include/SDL3/SDL_render.h
+++ b/include/SDL3/SDL_render.h
@@ -2751,7 +2751,7 @@ SDL_COMPILE_TIME_ASSERT(SDL_GPURenderStateDesc_SIZE,
* \since This struct is available since SDL 3.4.0.
*
* \sa SDL_CreateGPURenderState
- * \sa SDL_SetGPURenderStateFragmentUniformData
+ * \sa SDL_SetGPURenderStateFragmentUniforms
* \sa SDL_SetRenderGPUState
* \sa SDL_DestroyGPURenderState
*/
@@ -2768,7 +2768,7 @@ typedef struct SDL_GPURenderState SDL_GPURenderState;
*
* \since This function is available since SDL 3.4.0.
*
- * \sa SDL_SetGPURenderStateFragmentUniformData
+ * \sa SDL_SetGPURenderStateFragmentUniforms
* \sa SDL_SetRenderGPUState
* \sa SDL_DestroyGPURenderState
*/
@@ -2790,7 +2790,7 @@ extern SDL_DECLSPEC SDL_GPURenderState * SDLCALL SDL_CreateGPURenderState(SDL_Re
*
* \since This function is available since SDL 3.4.0.
*/
-extern SDL_DECLSPEC bool SDLCALL SDL_SetGPURenderStateFragmentUniformData(SDL_GPURenderState *state, Uint32 slot_index, const void *data, Uint32 length);
+extern SDL_DECLSPEC bool SDLCALL SDL_SetGPURenderStateFragmentUniforms(SDL_GPURenderState *state, Uint32 slot_index, const void *data, Uint32 length);
/**
* Set custom GPU render state.
diff --git a/src/dynapi/SDL_dynapi.sym b/src/dynapi/SDL_dynapi.sym
index d40edd232005d..8b3c48170e680 100644
--- a/src/dynapi/SDL_dynapi.sym
+++ b/src/dynapi/SDL_dynapi.sym
@@ -1239,7 +1239,7 @@ SDL3_0.0.0 {
SDL_SetDefaultTextureScaleMode;
SDL_GetDefaultTextureScaleMode;
SDL_CreateGPURenderState;
- SDL_SetGPURenderStateFragmentUniformData;
+ SDL_SetGPURenderStateFragmentUniforms;
SDL_SetRenderGPUState;
SDL_DestroyGPURenderState;
# extra symbols go here (don't modify this line)
diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h
index 31f8229eaf10f..df0848e280c5c 100644
--- a/src/dynapi/SDL_dynapi_overrides.h
+++ b/src/dynapi/SDL_dynapi_overrides.h
@@ -1264,6 +1264,6 @@
#define SDL_SetDefaultTextureScaleMode SDL_SetDefaultTextureScaleMode_REAL
#define SDL_GetDefaultTextureScaleMode SDL_GetDefaultTextureScaleMode_REAL
#define SDL_CreateGPURenderState SDL_CreateGPURenderState_REAL
-#define SDL_SetGPURenderStateFragmentUniformData SDL_SetGPURenderStateFragmentUniformData_REAL
+#define SDL_SetGPURenderStateFragmentUniforms SDL_SetGPURenderStateFragmentUniforms_REAL
#define SDL_SetRenderGPUState SDL_SetRenderGPUState_REAL
#define SDL_DestroyGPURenderState SDL_DestroyGPURenderState_REAL
diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h
index c87a014dfbcdd..7be1e52219037 100644
--- a/src/dynapi/SDL_dynapi_procs.h
+++ b/src/dynapi/SDL_dynapi_procs.h
@@ -1272,6 +1272,6 @@ SDL_DYNAPI_PROC(bool,SDL_RenderTexture9GridTiled,(SDL_Renderer *a,SDL_Texture *b
SDL_DYNAPI_PROC(bool,SDL_SetDefaultTextureScaleMode,(SDL_Renderer *a,SDL_ScaleMode b),(a,b),return)
SDL_DYNAPI_PROC(bool,SDL_GetDefaultTextureScaleMode,(SDL_Renderer *a,SDL_ScaleMode *b),(a,b),return)
SDL_DYNAPI_PROC(SDL_GPURenderState*,SDL_CreateGPURenderState,(SDL_Renderer *a,SDL_GPURenderStateDesc *b),(a,b),return)
-SDL_DYNAPI_PROC(bool,SDL_SetGPURenderStateFragmentUniformData,(SDL_GPURenderState *a,Uint32 b,const void *c,Uint32 d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(bool,SDL_SetGPURenderStateFragmentUniforms,(SDL_GPURenderState *a,Uint32 b,const void *c,Uint32 d),(a,b,c,d),return)
SDL_DYNAPI_PROC(bool,SDL_SetRenderGPUState,(SDL_Renderer *a,SDL_GPURenderState *b),(a,b),return)
SDL_DYNAPI_PROC(void,SDL_DestroyGPURenderState,(SDL_GPURenderState *a),(a),)
diff --git a/src/render/SDL_render.c b/src/render/SDL_render.c
index 8622e3a1af9e3..757be386f06f4 100644
--- a/src/render/SDL_render.c
+++ b/src/render/SDL_render.c
@@ -5906,7 +5906,7 @@ SDL_GPURenderState *SDL_CreateGPURenderState(SDL_Renderer *renderer, SDL_GPURend
return state;
}
-bool SDL_SetGPURenderStateFragmentUniformData(SDL_GPURenderState *state, Uint32 slot_index, const void *data, Uint32 length)
+bool SDL_SetGPURenderStateFragmentUniforms(SDL_GPURenderState *state, Uint32 slot_index, const void *data, Uint32 length)
{
if (!state) {
return SDL_InvalidParamError("state");
diff --git a/test/testgpurender_effects.c b/test/testgpurender_effects.c
index 24e4a8de0ebf0..9a725b8969e75 100644
--- a/test/testgpurender_effects.c
+++ b/test/testgpurender_effects.c
@@ -209,7 +209,7 @@ static bool InitGPURenderState(void)
SDL_zero(uniforms);
uniforms.texture_width = (float)target->w;
uniforms.texture_height = (float)target->h;
- if (!SDL_SetGPURenderStateFragmentUniformData(data->state, 0, &uniforms, sizeof(uniforms))) {
+ if (!SDL_SetGPURenderStateFragmentUniforms(data->state, 0, &uniforms, sizeof(uniforms))) {
SDL_Log("Couldn't set uniform data: %s", SDL_GetError());
return false;
}
diff --git a/test/testgpurender_msdf.c b/test/testgpurender_msdf.c
index af25b986bd1ba..982b27ae6a1f1 100644
--- a/test/testgpurender_msdf.c
+++ b/test/testgpurender_msdf.c
@@ -220,7 +220,7 @@ static bool InitGPURenderState(void)
uniforms.distance_field_range = DISTANCE_FIELD_RANGE;
uniforms.texture_width = (float)font_texture->w;
uniforms.texture_height = (float)font_texture->h;
- if (!SDL_SetGPURenderStateFragmentUniformData(render_state, 0, &uniforms, sizeof(uniforms))) {
+ if (!SDL_SetGPURenderStateFragmentUniforms(render_state, 0, &uniforms, sizeof(uniforms))) {
SDL_Log("Couldn't set uniform data: %s", SDL_GetError());
return false;
}