Eidolon
be021baa02
Add extern "C" in C++ to all headers
2022-12-30 19:26:16 -06:00
Sally Coolatta
9d7ec0ab8f
Merge SRB2 next
...
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
Jaime Ita Passos
0d04b14bb3
Remove GLMipmap_t.nextmipmap
2021-01-27 21:23:20 -03:00
Jaime Ita Passos
7e28b7d3e9
OpenGL backend: Manage uploaded GPU textures with an internal list
...
Indirectly fixes the game doing whatever after freeing a patch.
This commit implements a FTextureInfo struct type, instead of it being a typedef to the GLMipmap_s struct type.
2021-01-27 17:48:57 -03:00
Jaime Ita Passos
f928709fa5
Fix animated skincolors in OpenGL
2020-12-06 20:17:14 -03:00
Jaime Ita Passos
82b11c224a
Improve GPU texture management.
2020-11-22 18:18:26 -03:00
Jaime Ita Passos
b8a13e6006
Change how texture deletion works in OpenGL
2020-11-22 17:03:04 -03:00
Sally Coolatta
19016db338
Got through OGL
2020-08-15 06:20:22 -04:00
Sryder
67486dc0b6
Fix Simple opengl merge conflicts
...
hw_cache.c, hw_data.h, hw_defs.h, hw_dll.h, hw_draw.c, hw_drv.h, hw_glob.h, hw_md2.c, hw_md2.h, r_opengl.c
2020-08-10 17:39:34 +01:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
Jaime Passos
a7f3dd7eff
Refactor patch loading
2020-08-08 05:16:47 -03:00
Jaime Passos
ff7b9a5b5c
Remove unused texture formats
2020-07-06 00:58:09 -03:00
Jaime Passos
d283cc1d2a
Rename structs, turn GrTextureFormat_t into an enum
2020-07-06 00:52:10 -03:00
Jaime Passos
146da28f88
Remove GrTexInfo
2020-07-06 00:35:48 -03:00
Jaime Passos
abc4f22a3e
Delete hw_glide.h
2020-07-06 00:27:34 -03:00
Sryder
5cccff08aa
Basic merge some of the easier HW files.
...
hw_main and hw_md2 still need merge.
hw_cache needs evaluating for encore mode.
2020-05-29 20:43:34 +01:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
James R
79d93b86ca
Fix nonpacked to packed cast for OpenGL
...
(cherry picked from commit d2a7a87c7f39bd423fde7f8b4228082d12839583)
2020-04-11 22:10:05 -07:00
Wolfy
5e4ec61d82
Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
...
# Conflicts:
# src/hardware/hw_cache.c
# src/hardware/hw_draw.c
# src/hardware/hw_glob.h
# src/hardware/hw_main.c
# src/r_bsp.h
# src/r_data.c
2020-04-11 23:47:25 -05:00
Hannu Hanhi
fb6ffd08c7
Fix comment
2020-04-11 13:27:18 -05:00
Hannu Hanhi
edc87fbed9
Don't repeatedly look for texture files that don't exist. This fixes performance issues with models.
2020-04-11 13:27:17 -05:00
Sally Cochenour
07d355e4d3
FIX COLOR BUG
2020-02-17 01:19:28 -03:00
Sally Cochenour
8ee1cc9209
FIX COLOR BUG
2020-02-02 07:28:31 -05:00
Jaime Passos
2d4945d558
Update copyright text
2020-01-23 20:12:15 -03:00
Jaime Passos
7a753b701f
Fix TC_ blending
2019-12-12 22:26:28 -03:00
Jaime Passos
b078b8791a
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-11 14:41:55 -03:00
James R
fd74f1848c
Fix nonpacked to packed cast for OpenGL
2019-11-07 16:30:29 -08:00
Jaime Passos
402012e973
I
2019-08-18 14:16:48 -03:00
Jaime Passos
08efec4cf3
destroy hw_glide.h because no modern GPU supports such API
2019-03-21 18:23:40 -03:00
Jaime Passos
fd5fb73671
gl4
2019-03-17 22:27:50 -03:00
Monster Iestyn
7989e9a482
Merge branch 'public_next'
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/dehacked.c
# src/g_game.h
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_hudlib.c
# src/lua_libs.h
# src/lua_maplib.c
# src/lua_script.c
# src/m_misc.h
# src/p_mobj.c
# src/s_sound.c
# src/sdl12/mixer_sound.c
# src/w_wad.c
2018-11-10 15:41:57 +00:00
Monster Iestyn
eebdbc21f2
Removed all remaining traces of VID_X11 code in hw_drv.h and hw_data.h, the macro is no longer used by Linux etc versions of SRB2.
...
Unlike the rest of the commits in this branch (as of writing), I didn't make this commit between 1 and 2 years ago, I made it right now ;)
2018-10-27 19:58:51 +01:00
Monster Iestyn
3e595b8f1b
Merge branch 'master' into ports-chopping-block
2017-10-14 20:47:04 +01:00
Alam Ed Arias
6fbdf37b18
Build: support building with clang 5.0
2017-09-30 08:54:17 -04:00
Monster Iestyn
5a16c39af0
XBOX was eXecuted
2017-09-29 19:27:17 +01:00
Alam Ed Arias
f03e591f64
change SDL into HAVE_SDL
2014-07-25 19:10:24 -04:00
Alam Ed Arias
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
