Zack Middleton
9839534543
Merge branch 'misc/lilium_common' into game/eliteforce
2015-07-24 23:56:15 -05:00
Zack Middleton
a5fbc1bfc4
Fix alloc size for default skin and single shader skin
...
Found by Coverity.
2015-07-12 20:41:47 -05:00
Zack Middleton
4473924636
Remove logically dead code in R_CheckFBO
...
Found by Coverity.
2015-07-12 20:35:22 -05:00
Zack Middleton
9f57fea0ee
Backport ignoring values outside lightgrid to OpenGL1
...
Fixes possibly of reading memory past end of lightGridData or reading
wrong light grid data (wrapping around to next row).
2015-07-12 18:17:57 -05:00
Zack Middleton
c51801e4c9
Merge branch 'master' into game/eliteforce
2015-07-09 22:43:24 -05:00
Zack Middleton
1bb2bc370d
Fix OpenGL2 ignoring last light grid point on each axis
...
Also change light grid bounds clamping to make it more clear what invalid
values are.
2015-07-09 22:42:01 -05:00
Zack Middleton
6b9a3a47db
Merge branch 'master' into game/eliteforce
...
Conflicts:
code/renderergl1/tr_main.c
code/renderergl2/tr_main.c
2015-07-09 18:42:11 -05:00
Zack Middleton
b152cf1423
Don't fog 3D crosshair sprite
2015-07-04 19:33:28 -05:00
Zack Middleton
5e575ae82e
Apply greyscaling to fog blocks
2015-07-04 19:17:58 -05:00
Zack Middleton
73de855c27
Merge branch 'master' into game/eliteforce
...
Conflicts:
code/client/cl_main.c
2015-06-24 16:48:46 -05:00
Zack Middleton
f110f668bf
Move image load function prototypes to tr_common.h
...
The functions themselves are in code/renderercommon/tr_image_*.c
2015-06-12 14:22:37 -05:00
Zack Middleton
56bdf5d656
Merge branch 'master' into game/eliteforce
2015-04-30 22:34:34 -05:00
SmileTheory
3ebc230b28
OpenGL2: Use signed value in case value goes below 0.
2015-04-06 03:05:28 -07:00
Zack Middleton
c755d75a5e
Fix MDR surface indexes overflow check
...
Also, use the check overflow macro like everywhere else.
2015-03-25 15:41:03 -05:00
Zack Middleton
1a7628126a
OpenGL2: Fix shadow cubemap segfault
...
Changed image size to 512, but 'data' buffer is only 16x16 resulting
in libGL segfault. Use NULL instead like other dynamic images.
2015-03-24 03:39:53 -05:00
Zack Middleton
956bea9cda
Merge branch 'master' into game/eliteforce
2015-03-23 23:54:32 -05:00
Author: Xycaleth
33efe82de9
OpenGL2: Fix shadow cubemap size
2015-03-23 20:05:35 -05:00
SmileTheory
40cfbc9a82
OpenGL2: Fix culling again.
2015-03-12 21:44:06 -07:00
Zack Middleton
99b74fc5bf
OpenGL2: Remove unused function prototype from tr_fbo.c
2015-02-07 18:52:03 -06:00
Ensiform
43c7f1e734
Inform how many shader stages the max is in the warning message
2015-01-26 02:39:59 -06:00
Zack Middleton
6557800707
Merge branch 'master' into game/eliteforce
2014-12-02 17:40:09 -06:00
SmileTheory
8c7fedb1fe
OpenGL2: Fix face culling.
2014-11-30 21:50:33 -08:00
SmileTheory
fd23249357
OpenGL2: Ensure tess VAO is bound before using it.
2014-11-21 16:12:53 -08:00
Zack Middleton
c787cf3aef
Fix stencil shadows not drawing if has 500 or more vertexes
...
Stencil shadow is not drawn if a mesh, or multiple meshes with the same
entity and shader, have more than 500 vertexes. The issue is caused by storing
the projected positions in the tess vertex buffer. Use a new array instead.
2014-11-16 21:21:30 -06:00
Zack Middleton
d06deb41c8
Don't set fog image border color
...
GL1's R_CreateImage sets GL texture to 0 before it ends, so border color is not
applied to the fog image. GL_CLAMP is not used for fog image (in either renderer),
so it would presumably not be used even if applied to the fog image.
2014-11-16 14:59:09 -06:00
Zack Middleton
60d28722ef
Remove unfinished OpenGL display list code
...
It seems unlikely anyone is going to do anything with this aside from stub
it out in OpenGLES ports.
2014-11-16 14:57:13 -06:00
Zack Middleton
22bcda018b
Correct a few OpenGL variable types
...
Affectly no change for desktop OpenGL.
Use correct types for OpenGLES support.
2014-11-16 14:56:43 -06:00
SmileTheory
89b719ec8d
OpenGL2: Bit more parallax optimization.
2014-11-14 01:12:41 -08:00
SmileTheory
d9e2184c1a
OpenGL2: Add support for parallax occlusion mapping.
2014-11-10 22:11:36 -08:00
SmileTheory
b1821e303d
OpenGL2: remove lightmap support from generic glsl shader.
...
This path was barely used and doing this compiles fewer shaders.
2014-11-10 21:59:37 -08:00
SmileTheory
1ad2b413ef
Remove accidentally added increment.
2014-11-03 22:18:17 -08:00
SmileTheory
943259f6b4
OpenGL2: Support half floats for texcoords and vertex colors.
2014-11-03 19:10:35 -08:00
Zack Middleton
475e145d05
Fix holodeck doors fade out
...
Using the GL1 statebits in GL2 causes the doors to not fade not. Period.
In GL1 the items 'pop' into view after doors fade out completely.
Fix them both to fade out and blend over items.
2014-10-29 11:34:49 -05:00
Zack Middleton
b7cd6b6088
Elite Force white space clean up
...
Also fixed some code to match ioq3 (a few comments, a printf, ..).
2014-10-29 10:13:12 -05:00
Zack Middleton
ccd93c127b
Port Elite Force renderer changes to OpenGL2
...
Appling the diff to renderergl2 mostly worked.
Had to change GLimp_HaveExtension to use GL_EXTENTIONS
directly because Elite Forces GL2 requires an extension that didn't fit in (the smaller than Q3)
glConfig.extensions_string.
Had to set ambientLight for RF_FULLBRIGHT, GL2 doesn't use ambientLightInt.
Made the RF_FORCE_ENT_ALPHA code change pStage->stateBits because the stateBits
are read a lot, whereas in GL1 it's done as an expression and passed to GL_State.
Copied from Spearmint.
There are a few issues; holodeck doors are missing and parts of light grid are black (???).
2014-10-29 09:00:23 -05:00
Zack Middleton
1ba9e7a45e
Always use GL_Cull to change cull state
...
Manually changing cull state can cause later GL_Cull calls to not change
the cull state.
2014-10-29 01:32:50 -05:00
SmileTheory
e488663e31
OpenGL2: Change normal/tangent vertex encoding.
2014-10-28 18:15:13 -07:00
SmileTheory
7e808f92d6
OpenGL2: Speed up tonemap shader.
2014-10-27 06:37:57 -07:00
SmileTheory
3765652778
OpenGL2: Fix corrupt models.
2014-10-23 16:51:10 -07:00
SmileTheory
4f5ebf8349
OpenGL2: Bit of multidraw optimization.
2014-10-16 00:32:20 -07:00
SmileTheory
03ac9649ea
Fix a bug in previous commit.
2014-10-15 20:28:26 -07:00
SmileTheory
e34972b110
OpenGL2: Fix missing surfaces with r_mergeMultidraws 2.
2014-10-15 20:00:54 -07:00
SmileTheory
541d3a40c2
OpenGL2: Interleave vertex data for static MD3s.
2014-10-15 03:42:29 -07:00
SmileTheory
05e07311ba
OpenGL2: Fix invalid texture parameter.
2014-10-15 03:40:16 -07:00
SmileTheory
0578b70f38
OpenGL2: Reduce redundant GL calls.
2014-10-14 06:15:06 -07:00
SmileTheory
84206c8598
OpenGL2: Vertex array object support.
2014-10-14 01:50:44 -07:00
SmileTheory
873a02bd3c
OpenGL2: VBO cleanup.
2014-10-13 21:57:06 -07:00
SmileTheory
a90c17ac1b
OpenGL2: Better BSP surface merging.
2014-10-07 04:17:01 -07:00
Zack Middleton
918eed9295
OpenGL2: Don't segfault if r_ext_multitexture is disabled
2014-09-29 01:02:13 -05:00
Zack Middleton
a955d975b7
Add function for clearing global shader instead of duplicating the code
2014-09-27 01:35:35 -05:00