1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
|
From: Sam Lantinga <slouken@libsdl.org>
Date: Tue, 2 Sep 2025 17:48:02 -0700
Subject: Set the texture scale and address mode when creating a texture
(cherry picked from commit ef19c7201549c3ec07aab2479c44ee259d616efe)
Bug: https://github.com/libsdl-org/sdl2-compat/issues/506
Origin: upstream, 3.2.24, commit:f2ae66b64fad53e98483c4b7006696a892006aff
---
src/render/opengl/SDL_render_gl.c | 85 +++++++++++++++++++--------------
src/render/opengles2/SDL_render_gles2.c | 17 ++++++-
2 files changed, 63 insertions(+), 39 deletions(-)
diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c
index fecd365..39db57f 100644
--- a/src/render/opengl/SDL_render_gl.c
+++ b/src/render/opengl/SDL_render_gl.c
@@ -439,6 +439,40 @@ static bool convert_format(Uint32 pixel_format, GLint *internalFormat, GLenum *f
return true;
}
+static bool SetTextureScaleMode(GL_RenderData *data, GLenum textype, SDL_ScaleMode scaleMode)
+{
+ switch (scaleMode) {
+ case SDL_SCALEMODE_NEAREST:
+ data->glTexParameteri(textype, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ data->glTexParameteri(textype, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ break;
+ case SDL_SCALEMODE_LINEAR:
+ data->glTexParameteri(textype, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ data->glTexParameteri(textype, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ break;
+ default:
+ return SDL_SetError("Unknown texture scale mode: %d", scaleMode);
+ }
+ return true;
+}
+
+static bool SetTextureAddressMode(GL_RenderData *data, GLenum textype, SDL_TextureAddressMode addressMode)
+{
+ switch (addressMode) {
+ case SDL_TEXTURE_ADDRESS_CLAMP:
+ data->glTexParameteri(textype, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ data->glTexParameteri(textype, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ break;
+ case SDL_TEXTURE_ADDRESS_WRAP:
+ data->glTexParameteri(textype, GL_TEXTURE_WRAP_S, GL_REPEAT);
+ data->glTexParameteri(textype, GL_TEXTURE_WRAP_T, GL_REPEAT);
+ break;
+ default:
+ return SDL_SetError("Unknown texture address mode: %d", addressMode);
+ }
+ return true;
+}
+
static bool GL_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SDL_PropertiesID create_props)
{
GL_RenderData *renderdata = (GL_RenderData *)renderer->internal;
@@ -535,10 +569,12 @@ static bool GL_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SDL_P
data->format = format;
data->formattype = type;
- data->texture_scale_mode = SDL_SCALEMODE_INVALID;
- data->texture_address_mode = SDL_TEXTURE_ADDRESS_INVALID;
+ data->texture_scale_mode = texture->scaleMode;
+ data->texture_address_mode = SDL_TEXTURE_ADDRESS_CLAMP;
renderdata->glEnable(textype);
renderdata->glBindTexture(textype, data->texture);
+ SetTextureScaleMode(renderdata, textype, data->texture_scale_mode);
+ SetTextureAddressMode(renderdata, textype, data->texture_address_mode);
#ifdef SDL_PLATFORM_MACOS
#ifndef GL_TEXTURE_STORAGE_HINT_APPLE
#define GL_TEXTURE_STORAGE_HINT_APPLE 0x85BC
@@ -570,10 +606,11 @@ static bool GL_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SDL_P
renderdata->glTexImage2D(textype, 0, internalFormat, texture_w,
texture_h, 0, format, type, NULL);
}
- renderdata->glDisable(textype);
if (!GL_CheckError("glTexImage2D()", renderer)) {
return false;
}
+ SetTextureScaleMode(renderdata, textype, data->texture_scale_mode);
+ SetTextureAddressMode(renderdata, textype, data->texture_address_mode);
#ifdef SDL_HAVE_YUV
if (texture->format == SDL_PIXELFORMAT_YV12 ||
@@ -596,11 +633,15 @@ static bool GL_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SDL_P
renderdata->glBindTexture(textype, data->utexture);
renderdata->glTexImage2D(textype, 0, internalFormat, (texture_w + 1) / 2,
(texture_h + 1) / 2, 0, format, type, NULL);
+ SetTextureScaleMode(renderdata, textype, data->texture_scale_mode);
+ SetTextureAddressMode(renderdata, textype, data->texture_address_mode);
SDL_SetNumberProperty(props, SDL_PROP_TEXTURE_OPENGL_TEXTURE_U_NUMBER, data->utexture);
renderdata->glBindTexture(textype, data->vtexture);
renderdata->glTexImage2D(textype, 0, internalFormat, (texture_w + 1) / 2,
(texture_h + 1) / 2, 0, format, type, NULL);
+ SetTextureScaleMode(renderdata, textype, data->texture_scale_mode);
+ SetTextureAddressMode(renderdata, textype, data->texture_address_mode);
SDL_SetNumberProperty(props, SDL_PROP_TEXTURE_OPENGL_TEXTURE_V_NUMBER, data->vtexture);
}
@@ -617,6 +658,8 @@ static bool GL_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SDL_P
renderdata->glBindTexture(textype, data->utexture);
renderdata->glTexImage2D(textype, 0, GL_LUMINANCE_ALPHA, (texture_w + 1) / 2,
(texture_h + 1) / 2, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, NULL);
+ SetTextureScaleMode(renderdata, textype, data->texture_scale_mode);
+ SetTextureAddressMode(renderdata, textype, data->texture_address_mode);
SDL_SetNumberProperty(props, SDL_PROP_TEXTURE_OPENGL_TEXTURE_UV_NUMBER, data->utexture);
}
#endif
@@ -651,6 +694,8 @@ static bool GL_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SDL_P
}
#endif // SDL_HAVE_YUV
+ renderdata->glDisable(textype);
+
return GL_CheckError("", renderer);
}
@@ -1074,40 +1119,6 @@ static bool SetDrawState(GL_RenderData *data, const SDL_RenderCommand *cmd, cons
return true;
}
-static bool SetTextureScaleMode(GL_RenderData *data, GLenum textype, SDL_ScaleMode scaleMode)
-{
- switch (scaleMode) {
- case SDL_SCALEMODE_NEAREST:
- data->glTexParameteri(textype, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- data->glTexParameteri(textype, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- break;
- case SDL_SCALEMODE_LINEAR:
- data->glTexParameteri(textype, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- data->glTexParameteri(textype, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- break;
- default:
- return SDL_SetError("Unknown texture scale mode: %d", scaleMode);
- }
- return true;
-}
-
-static bool SetTextureAddressMode(GL_RenderData *data, GLenum textype, SDL_TextureAddressMode addressMode)
-{
- switch (addressMode) {
- case SDL_TEXTURE_ADDRESS_CLAMP:
- data->glTexParameteri(textype, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- data->glTexParameteri(textype, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- break;
- case SDL_TEXTURE_ADDRESS_WRAP:
- data->glTexParameteri(textype, GL_TEXTURE_WRAP_S, GL_REPEAT);
- data->glTexParameteri(textype, GL_TEXTURE_WRAP_T, GL_REPEAT);
- break;
- default:
- return SDL_SetError("Unknown texture address mode: %d", addressMode);
- }
- return true;
-}
-
static bool SetCopyState(GL_RenderData *data, const SDL_RenderCommand *cmd)
{
SDL_Texture *texture = cmd->data.draw.texture;
diff --git a/src/render/opengles2/SDL_render_gles2.c b/src/render/opengles2/SDL_render_gles2.c
index 410326b..b582e3e 100644
--- a/src/render/opengles2/SDL_render_gles2.c
+++ b/src/render/opengles2/SDL_render_gles2.c
@@ -1616,8 +1616,8 @@ static bool GLES2_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SD
data->texture_u = 0;
data->texture_v = 0;
#endif
- data->texture_scale_mode = SDL_SCALEMODE_INVALID;
- data->texture_address_mode = SDL_TEXTURE_ADDRESS_INVALID;
+ data->texture_scale_mode = texture->scaleMode;
+ data->texture_address_mode = SDL_TEXTURE_ADDRESS_CLAMP;
// Allocate a blob for image renderdata
if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
@@ -1659,6 +1659,13 @@ static bool GLES2_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SD
renderdata->glActiveTexture(GL_TEXTURE2);
renderdata->glBindTexture(data->texture_type, data->texture_v);
renderdata->glTexImage2D(data->texture_type, 0, format, (texture->w + 1) / 2, (texture->h + 1) / 2, 0, format, type, NULL);
+ if (!GL_CheckError("glTexImage2D()", renderer)) {
+ SDL_free(data->pixel_data);
+ SDL_free(data);
+ return false;
+ }
+ SetTextureScaleMode(renderdata, data->texture_type, data->texture_scale_mode);
+ SetTextureAddressMode(renderdata, data->texture_type, data->texture_address_mode);
SDL_SetNumberProperty(SDL_GetTextureProperties(texture), SDL_PROP_TEXTURE_OPENGLES2_TEXTURE_V_NUMBER, data->texture_v);
data->texture_u = (GLuint)SDL_GetNumberProperty(create_props, SDL_PROP_TEXTURE_CREATE_OPENGLES2_TEXTURE_U_NUMBER, 0);
@@ -1680,6 +1687,8 @@ static bool GLES2_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SD
SDL_free(data);
return false;
}
+ SetTextureScaleMode(renderdata, data->texture_type, data->texture_scale_mode);
+ SetTextureAddressMode(renderdata, data->texture_type, data->texture_address_mode);
SDL_SetNumberProperty(SDL_GetTextureProperties(texture), SDL_PROP_TEXTURE_OPENGLES2_TEXTURE_U_NUMBER, data->texture_u);
if (!SDL_GetYCbCRtoRGBConversionMatrix(texture->colorspace, texture->w, texture->h, 8)) {
@@ -1707,6 +1716,8 @@ static bool GLES2_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SD
SDL_free(data);
return false;
}
+ SetTextureScaleMode(renderdata, data->texture_type, data->texture_scale_mode);
+ SetTextureAddressMode(renderdata, data->texture_type, data->texture_address_mode);
SDL_SetNumberProperty(SDL_GetTextureProperties(texture), SDL_PROP_TEXTURE_OPENGLES2_TEXTURE_UV_NUMBER, data->texture_u);
if (!SDL_GetYCbCRtoRGBConversionMatrix(texture->colorspace, texture->w, texture->h, 8)) {
@@ -1737,6 +1748,8 @@ static bool GLES2_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SD
return false;
}
}
+ SetTextureScaleMode(renderdata, data->texture_type, data->texture_scale_mode);
+ SetTextureAddressMode(renderdata, data->texture_type, data->texture_address_mode);
SDL_SetNumberProperty(SDL_GetTextureProperties(texture), SDL_PROP_TEXTURE_OPENGLES2_TEXTURE_NUMBER, data->texture);
SDL_SetNumberProperty(SDL_GetTextureProperties(texture), SDL_PROP_TEXTURE_OPENGLES2_TEXTURE_TARGET_NUMBER, data->texture_type);
|
