Commit graph

172 commits

Author SHA1 Message Date
Jaime Passos d87c874559 Fix GL y-shearing ignoring a Y-flipped transform 2020-07-10 19:19:51 -03:00
kaysrishaq c74a607c54 Whoops, switched these for no reason 2020-06-19 11:11:19 -04:00
kaysrishaq cad1f57b1e FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements) 2020-06-19 11:11:18 -04:00
Hannu Hanhi 9477d372b9 Backwards compatibility for shaderless hardware 2020-06-18 17:39:34 +03:00
Steel Titanium 3946309ece 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 2cefe82950 Fix OSX null-pointer-arithmetic error 2020-06-08 00:08:07 -04:00
Hannu Hanhi 0e521922c6 Change some unsigned ints to UINT32 2020-06-07 21:32:52 +03:00
Hannu Hanhi abe13651d0 OpenGL draw call batching system 2020-06-07 21:20:52 +03:00
Hannu Hanhi 78c2928b8b Optimization: also don't reset shader on models 2020-04-25 16:32:44 +03:00
Hannu Hanhi c0c095e1d1 Optimization: only call pglUseProgram if shader actually needs changing 2020-04-25 16:32:32 +03:00
Hannu Hanhi 0758a8caec Optimization: Don't reset shader program at end of DrawPolygon, instead reset it in UnSetShader 2020-04-25 16:32:21 +03:00
fickleheart b9d7b3e5c5 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 4a489c4d95 Fix NOTEXTURE_NUM 2020-02-28 18:57:34 -03:00
Jaime Passos 9b88edc458 Same deal for screen textures 2020-02-28 18:57:15 -03:00
Jaime Passos 48b352049f Stop using NextTexAvail 2020-02-28 18:56:41 -03:00
Steel Titanium 76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R 7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Jaime Passos b6b875f934 so is the accumulation buffer (deprecated) 2020-01-28 00:33:45 -03:00
Jaime Passos 93fe6a50ac glFog is unused 2020-01-28 00:26:09 -03:00
Jaime Passos 35983c7ae5 load_shaders -> Shader_Load + Shader_SetUniforms 2020-01-28 00:20:10 -03:00
Jaime Passos af7b4795b7 port pfnUpdateTexture 2020-01-28 00:16:38 -03:00
Jaime Passos 9e79b337b1 Fix NOTEXTURE_NUM 2020-01-25 22:20:27 -03:00
Jaime Passos e576c1ada1 make up for the lack of ogllog.txt 2020-01-25 22:17:39 -03:00
Jaime Passos 8bcdd105ce I'll put this back in here, I guess. 2020-01-25 21:57:05 -03:00
Jaime Passos 647107a220 Same deal for screen textures 2020-01-25 21:46:52 -03:00
Jaime Passos c219a170da Stop using NextTexAvail you dunce 2020-01-25 21:37:33 -03:00
Jaime Passos b9b1958886 make NOTEXTURE_NUM 1 2020-01-25 21:22:24 -03:00
Jaime Passos 8401e09787 remove includes 2020-01-25 21:21:44 -03:00
Jaime Passos 075ae996fa GL_DBG_Printf instead of CONS_Alert 2020-01-24 17:04:38 -03:00
Jaime Passos 1c7b584dee I_Error is too extreme I think, just CONS_Alert instead 2020-01-24 17:03:00 -03:00
Jaime Passos a521e40c0e bye 2020-01-23 23:09:53 -03:00
Jaime Passos 11c3721db4 Fix warnings around load_shaders 2020-01-23 22:30:36 -03:00
Jaime Passos d24060bb94 Wait. 2020-01-23 22:24:35 -03:00
James R 968fea0383 Fix implicit operand because GLSL is a goof or such 2020-01-23 17:22:02 -08:00
Jaime Passos 770135451f Restore some model lighting code that went gone in the shaders code 2020-01-23 22:02:18 -03:00
Jaime Passos 1755c240bf Fix the gl_leveltime problem, I guess.
This is probably superfluous.
2020-01-23 21:25:54 -03:00
Jaime Passos 544d6acc51 Delete USE_PALETTED_TEXTURE again 2020-01-23 20:21:13 -03:00
Jaime Passos 1601f0c66f Update copyright text 2020-01-23 20:12:15 -03:00
Jaime Passos 014638ead7 Fix view aiming / shearing 2020-01-23 19:44:46 -03:00
Sally Cochenour 7e333c6331 input is reserved apparently 2020-01-18 09:25:09 -05:00
fickleheart 84329fcd26 OGL can have little a viewroll 2020-01-17 19:01:45 -06:00
Sally Cochenour e5215e929c Merge branch 'gl-dropshadows' into oglshaderport 2020-01-16 14:55:55 -05:00
Monster Iestyn c7ab065b0a Merge branch 'master' into next 2020-01-11 18:38:09 +00:00
Sally Cochenour 5fac6f542e Merge branch 'namirays' into oglshaderport 2020-01-11 09:32:59 -05:00
James R 5c60f8b529 Merge branch 'software-fov' into 'master'
Software FOV

See merge request STJr/SRB2!662
2020-01-10 00:33:24 -05:00
James R 7deb18bdc9 Merge remote-tracking branch 'origin/master' into next 2020-01-08 13:27:14 -08:00
Sally Cochenour 465b3b1559 Water surface shader
Does not warp anything beneath the surface YET, just the texture itself, but it's far better than nothing
2020-01-08 03:37:46 -05:00
Sally Cochenour 7d8ff43019 Basic fog shader
HWR_FogBlockAlpha is still very inaccurate, which gives different results than Software even with the shader, but it's a start
2020-01-07 20:55:36 -05:00
Jaime Passos d93adbacbb Fix GetTextureUsed 2020-01-05 18:10:33 -03:00
fickleheart 8bc58807aa Software FOV ported from kart
also fixes high software FOVs having buggy walls
2019-12-31 11:22:05 -06:00