Commit graph

106 commits

Author SHA1 Message Date
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
James R
e09a430804 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
Jaime Passos
a9da775dd9 Merge remote-tracking branch 'origin/next' into opengl-blending-fix 2020-07-06 19:48:13 -03:00
Jaime Passos
615c7121ed gr_ -> gl_ 2020-07-06 01:15:08 -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
Hannu Hanhi
8ea66e3813 OpenGL draw call batching system 2020-06-07 21:20:52 +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
Jaime Passos
1b81e81c56 Attempt to properly match Software texture blending
without messing with the original ASTBlendPixel function
2020-05-16 13:51:10 -03:00
Sally Coolatta
95a077b4dd C'mon git merge everything, not just most of it |:V 2020-05-12 03:16:35 -04:00
James R
eb0ba37dce Merge remote-tracking branch 'origin/master' into HEAD 2020-04-24 22:10:59 -07:00
Steel Titanium
71f21dd81b Fix compile errors 2020-04-13 23:07: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
fickleheart
6b4a054973 Use po2 patches to fix mipmaps 2020-03-14 15:52:25 -05:00
Jaime Passos
875afea599 Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF 2020-02-28 17:31:41 -03:00
Jaime Passos
830583d973 why does this still exist? 2020-02-08 18:19:27 -03:00
Jaime Passos
e5ca7039cf no more 3dfx 2020-01-28 00:56:22 -03:00
Jaime Passos
933e690da3 i want to die 2020-01-28 00:41:41 -03:00
Jaime Passos
2d4945d558 Update copyright text 2020-01-23 20:12:15 -03:00
Jaime Passos
c47ab3b31f Fix chroma key 2020-01-05 22:04:19 -03:00
Jaime Passos
71f7130abe AA trees are not needed at all for rotated patches 2020-01-05 03:10:03 -03:00
Jaime Passos
4630b8615c Remove unused parameter 2020-01-01 17:36:55 -03:00
Jaime Passos
b8e91a50a5 OpenGL funny 2019-12-27 00:02:30 -03:00
Jaime Passos
f55b4bf6ad Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-25 05:43:46 -03:00
Jaime Passos
11dc6801dc Update comments 2019-12-17 16:14:26 -03:00
Jaime Passos
1002c47407 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-17 16:12:44 -03:00
Jaime Passos
da81238610 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-17 15:05:16 -03:00
Jaime Passos
3c9cc53185 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-11 21:53:47 -03:00
Jaime Passos
6976b9bf01 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
Jaime Passos
4ccc854a90 Die 2019-12-08 22:12:56 -03:00
Jaime Passos
5d2bbb53fc Optimize mipmaps 2019-12-08 03:23:37 -03:00
Jaime Passos
4765062db7 Make some things clearer here. 2019-12-08 01:54:03 -03:00
Jaime Passos
e0c5bb649a Cleanup FreeMipmapColormap 2019-12-07 23:46:05 -03:00
Jaime Passos
eb18ee8a97 Fix FreeMipmapColormap yet again 2019-12-04 15:50:17 -03:00
Jaime Passos
6cdcb24360 Fix FreeMipmapColormap crash 2019-11-24 17:37:11 -03:00
Jaime Passos
24d20d2abb Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-12 21:38:02 -03:00
Jaime Passos
845b82668b Merge remote-tracking branch 'origin/master' into renderswitch 2019-11-12 20:25:40 -03:00
Jaime Passos
66b009722b Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-11-12 18:26:51 -03:00
MascaraSnake
fae4fb16e9 Merge branch 'internal-md3-vanilla-c' into 'master'
Internal MD3 merge 2 good riddance glBegin

See merge request STJr/SRB2Internal!362
2019-11-12 15:44:20 -05:00
Latapostrophe
f0bfd08c81 fix encore for ogl 2019-11-12 00:21:37 +01:00
Jaime Passos
b078b8791a Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-11 14:41:55 -03:00
Jaime Passos
d4bf34b714 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-11-11 14:10:37 -03:00
Jaime Passos
33de0ad0d7 Merge remote-tracking branch 'origin/master' into texture-flats-optimization 2019-11-11 14:05:03 -03:00
Jaime Passos
e8c475c1e9 Trying to make sense of chroma keying 2019-11-09 14:09:20 -03:00
Jaime Passos
d7f38ed2c9 Support OpenGL 2019-11-09 13:28:56 -03:00
Jaime Passos
911238945c fix invisible planes, fix flat animation 2019-11-08 23:42:15 -03:00
Jaime Passos
a1339b60ad Merge remote-tracking branch 'origin/master' into texture-flats-optimization 2019-11-08 23:01:29 -03:00