thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
17909 commits 1 branch 12 tags 205 MiB
Commit graph

286 commits

Author SHA1 Message Date
Hannu Hanhi
a5f4c3eeb0 Backwards compatibility for shaderless hardware 2020-06-18 17:39:34 +03:00
Steel Titanium
06f76f07f4 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport 
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
 2020-06-17 18:15:07 -04:00
mazmazz
b62497911c Fix OSX null-pointer-arithmetic error 2020-06-08 00:08:07 -04:00
Hannu Hanhi
6cdb8c3320 Change some unsigned ints to UINT32 2020-06-07 21:32:52 +03:00
Hannu Hanhi
8ea66e3813 OpenGL draw call batching system 2020-06-07 21:20:52 +03: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
Steel Titanium
52c8ba5d49 Fix opengl crashing on startup due to lack of checks 
Also fixes the log file not being written to the home directory.
 2020-05-23 16:21:26 -04:00
Sryder
b2674a3cd0 Initialise these to 0 just to stop GCC 4.4 from complaining. 
This should be okay since 0 generally means "nothing" for these, and they should always be set before being used later on.
 2020-05-20 11:47:22 +01:00
Wolfy
c3d34198ef Shader batching additions 2020-04-29 00:03:02 -05:00
Sally Cochenour
9483b72410 Forgotten / TICRATE 2020-04-25 21:33:34 -04:00
Sally Cochenour
f2aa2bb541 'sal-lighting' code ports from v2 2020-04-25 20:56:50 -04:00
Hannu Hanhi
9daa78554d Optimization: also don't reset shader on models 2020-04-25 16:32:44 +03:00
Hannu Hanhi
cb62882e5a Optimization: only call pglUseProgram if shader actually needs changing 2020-04-25 16:32:32 +03:00
Hannu Hanhi
44c420a671 Optimization: Don't reset shader program at end of DrawPolygon, instead reset it in UnSetShader 2020-04-25 16:32:21 +03:00
Wolfy
98183fef6f Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix 
# Conflicts:
#	src/hardware/hw_main.c
#	src/hardware/r_opengl/r_opengl.c
 2020-04-24 18:10:25 -05:00
Hannu Hanhi
1e6444767e Fix mistake in previous commit 2020-04-22 23:50:50 +03:00
Hannu Hanhi
e4bbe42eec Fix lighting breaking if trying to use unavailable shaders 2020-04-22 23:50:14 +03:00
Hannu Hanhi
74b846a6e3 Sky dome from SRB2 2020-04-22 00:18:58 +03:00
Hannu Hanhi
0467510b2e Don't crash if shaders are unavailable 2020-04-21 23:45:48 +03:00
Hannu Hanhi
e569129b55 Newer color tinting shaders ported from SRB2 shader branch 2020-04-21 23:15:44 +03:00
Steel Titanium
71f21dd81b Fix compile errors 2020-04-13 23:07:38 -04:00
Hannu Hanhi
4d5ff9fbe6 Backport from SRB2: Replace NextTexAvail with glGenTextures 2020-04-12 06:39:00 -05:00
Hannu Hanhi
6bf90fc441 Batching! 2020-04-12 03:09:07 +03:00
fickleheart
33a9e5aa83 Merge remote-tracking branch 'upstream/master' into shaders-222 
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
#	src/i_video.h
#	src/r_main.c
#	src/r_main.h
#	src/screen.c
#	src/sdl/i_video.c
#	src/sdl/ogl_sdl.c
#	src/w_wad.c
 2020-03-14 12:52:15 -05:00
Jaime Passos
86dd35c32b Fix NOTEXTURE_NUM 2020-02-28 18:57:34 -03:00
Jaime Passos
623974bf88 Same deal for screen textures 2020-02-28 18:57:15 -03:00
Jaime Passos
0b63c2a3cc Stop using NextTexAvail 2020-02-28 18:56:41 -03:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Jaime Passos
d31bfb5363 so is the accumulation buffer (deprecated) 2020-01-28 00:33:45 -03:00
Jaime Passos
43ecd55863 glFog is unused 2020-01-28 00:26:09 -03:00
Jaime Passos
64f1f2a7f8 load_shaders -> Shader_Load + Shader_SetUniforms 2020-01-28 00:20:10 -03:00
Jaime Passos
85f016e4d8 port pfnUpdateTexture 2020-01-28 00:16:38 -03:00
Jaime Passos
c80d7a2430 Fix NOTEXTURE_NUM 2020-01-25 22:20:27 -03:00
Jaime Passos
6df32ce34d make up for the lack of ogllog.txt 2020-01-25 22:17:39 -03:00
Jaime Passos
f6b9b14c21 Same deal for screen textures 2020-01-25 21:46:52 -03:00
Jaime Passos
3efd1f3f6d Stop using NextTexAvail you dunce 2020-01-25 21:37:33 -03:00
Jaime Passos
5228b0b9fe make NOTEXTURE_NUM 1 2020-01-25 21:22:24 -03:00
Jaime Passos
8345d7b99c remove includes 2020-01-25 21:21:44 -03:00
Jaime Passos
e8b942a3b8 GL_DBG_Printf instead of CONS_Alert 2020-01-24 17:04:38 -03:00
Jaime Passos
5a0119ee59 I_Error is too extreme I think, just CONS_Alert instead 2020-01-24 17:03:00 -03:00
Jaime Passos
6f2635d4c1 bye 2020-01-23 23:09:53 -03:00
Jaime Passos
9b927e7600 Fix warnings around load_shaders 2020-01-23 22:30:36 -03:00
Jaime Passos
40d9b7f34b Wait. 2020-01-23 22:24:35 -03:00
James R
70bcf59bd6 Fix implicit operand because GLSL is a goof or such 2020-01-23 17:22:02 -08:00
Jaime Passos
33152ee6fa Restore some model lighting code that went gone in the shaders code 2020-01-23 22:02:18 -03:00
Jaime Passos
5d3d031db3 Fix the gl_leveltime problem, I guess. 
This is probably superfluous.
 2020-01-23 21:25:54 -03:00
Jaime Passos
a37a028e81 Delete USE_PALETTED_TEXTURE again 2020-01-23 20:21:13 -03:00
Jaime Passos
2d4945d558 Update copyright text 2020-01-23 20:12:15 -03:00
Jaime Passos
4a8340cd4a Fix view aiming / shearing 2020-01-23 19:44:46 -03:00