yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-03-22 02:42:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

soft: fix build with SDL3

Browse source
This commit is contained in:
Denis Pauk 2025-02-10 00:25:30 +02:00
parent ae21db84d8
commit 3d3e7e9c98
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -19,6 +19,7 @@ State:
* base2: no known issues,
* mguhub: sometimes broken logic for surface fall in next maps.
* SOFT:
* build with SDL3 has glitch in menu,
* base1: broken wall light and wall glitch,
* base2: broken wall light and wall glitch,
* q64/outpost: scale textures unsupported,

2
src/client/refresh/soft/sw_draw.c
View file

@ -385,7 +385,7 @@ RE_Draw_StretchRaw(int x, int y, int w, int h, int cols, int rows, const byte *d
RE_Draw_StretchPicImplementation (x, y, w, h, &pic);
if (r_retexturing->value)
if (image_scaled != (byte *)data)
{
free(image_scaled);
}

16
src/client/refresh/soft/sw_main.c
View file

@ -2341,7 +2341,11 @@ RE_Draw_StretchDirectRaw(int x, int y, int w, int h, int cols, int rows, const b
}
/* Full screen update should be faster */
#ifdef USE_SDL3
if (!SDL_LockTexture(texture_rgba, NULL, (void**)&pixels, &pitch))
#else
if (SDL_LockTexture(texture_rgba, NULL, (void**)&pixels, &pitch))
#endif
{
Com_Printf("Can't lock texture: %s\n", SDL_GetError());
return;
@ -2377,16 +2381,28 @@ RE_Draw_StretchDirectRaw(int x, int y, int w, int h, int cols, int rows, const b
if (cols == vid_buffer_width && rows == vid_buffer_height)
{
#ifdef USE_SDL3
SDL_RenderTexture(renderer, texture_rgba, NULL, NULL);
#else
SDL_RenderCopy(renderer, texture_rgba, NULL, NULL);
#endif
}
else
{
#ifdef USE_SDL3
SDL_FRect srcrect;
#else
SDL_Rect srcrect;
#endif
srcrect.x = 0;
srcrect.y = 0;
srcrect.w = cols;
srcrect.h = rows;
#ifdef USE_SDL3
SDL_RenderTexture(renderer, texture_rgba, &srcrect, NULL);
#else
SDL_RenderCopy(renderer, texture_rgba, &srcrect, NULL);
#endif
}
SDL_RenderPresent(renderer);