Jaime Passos
|
a7f3dd7eff
|
Refactor patch loading
|
2020-08-08 05:16:47 -03:00 |
|
James R
|
36210abee8
|
Merge branch 'ogl-model-lighting-shader' into 'next'
Add capability to use model lighting with shaders enabled
See merge request STJr/SRB2!1073
|
2020-08-05 19:50:31 -04:00 |
|
Hannu Hanhi
|
6fd250117a
|
Don't discard zero alpha fog block fragments. Fixes #198.
|
2020-07-23 18:24:41 +03:00 |
|
Hannu Hanhi
|
1c4d605b51
|
Fix shader comment
|
2020-07-19 16:07:53 +03:00 |
|
Hannu Hanhi
|
e575676887
|
Don't override custom shaders with model lighting shader
|
2020-07-18 15:48:37 +03:00 |
|
Hannu Hanhi
|
5b8c41fffd
|
Add capability to use model lighting with shaders enabled
|
2020-07-18 15:08:59 +03:00 |
|
James R
|
e09a430804
|
Merge remote-tracking branch 'origin/next' into remove-glide-2
|
2020-07-12 16:05:15 -07:00 |
|
Jaime Passos
|
fec258ccb8
|
Fix GL y-shearing ignoring a Y-flipped transform
|
2020-07-10 19:19:51 -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 |
|
kaysrishaq
|
18281fd511
|
Whoops, switched these for no reason
|
2020-06-19 11:11:19 -04:00 |
|
kaysrishaq
|
6f859fd44d
|
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
|
2020-06-19 11:11:18 -04:00 |
|
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 |
|
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 |
|
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 |
|
Sally Cochenour
|
394aab737d
|
input is reserved apparently
|
2020-01-18 09:25:09 -05:00 |
|