Ansariel
6a8272cfa8
Merge Firestorm LGPL
2018-04-07 11:54:06 +02:00
Nicky
6888ade517
Linux: Create a safe and happy place for GCC when including glh_linear.h
2018-03-26 20:05:34 +02:00
Ansariel
6219aec54f
Merge viewer-neko
2018-03-02 10:52:44 +01:00
Ansariel
c4e18fbcaa
Merge viewer-neko
2018-02-27 18:08:48 +01:00
andreykproductengine
d9064d3a4e
MAINT-8317 Fixed Local Textures for Advanced Lighting Projectors do not keep the selected texture.
2018-02-27 15:49:15 +02:00
Graham Linden graham@lindenlab.com
06bce2ddd0
Add debug setting and code to allow nVidia nSight graphics debugging to capture SL frames.
...
These changes are only enabled if RenderNsightDebugSupport is true and eliminate use of
some OpenGL legacy functionality which is incompatible with nSight capture
(mostly glReadPixels and other fixed-function pipe rendering calls).
2018-02-15 21:55:24 +00:00
Ansariel
13e89be3a5
Reset all VertexBuffer during TP
2017-04-26 16:04:06 +02:00
Ansariel
0c4c1b5968
Remove deprecated OpenGL QUADS rendering mode
2017-03-04 23:57:37 +01:00
Ansariel
44f904b680
Sync with upstream
2016-11-26 19:57:12 +01:00
Ansariel
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
Oz Linden
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
Ansariel
a45d3d8421
Merge Viewer-Bear
2015-06-20 15:35:15 +02:00
ruslantproductengine
29bdf1a234
MAINT-4839 FIXED Animation of Mesh Dress doesn't work.
...
MAINT-4165 FIXED Crash on skinned, texture animated geometry with deferred rendering enabled.
2015-03-01 14:10:54 +02:00
Nicky
2fa723d9d1
Revert BUG-6351 for now, as it's causing side effects.
2014-06-24 21:10:28 +02:00
Nicky
c913a301dd
Reorder of enums for eMatrixMode, NUM_MATRIX_MODES must be last.
2014-06-14 02:21:47 +02:00
Dave Parks
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
simon
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
Graham Madarasz
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
Graham Madarasz
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
Dave Parks
41ca92c67c
NORSPEC-54 Potential fix for crashing on all sorts of random operations.
2013-03-25 18:27:07 -05:00
Graham Madarasz (Graham Linden)
2fd0e6e8f9
Merge viewer-cat and resolve conflict with alternate self
2013-02-21 16:50:04 -08:00
Dave Parks
d1c056beba
MAINT-685 Fix for disabling basic shaders making high detail terrain render incorrectly.
2012-07-03 14:35:08 -05:00
Dave Parks
45d3e147ac
SH-1912 Add environment map back into shiny when lighting and shadows enabled.
2011-11-29 17:13:11 -06:00
Dave Parks
79912f9d3f
SH-2031 Profile guided optimization of matrix ops
...
- don't use F64 except where needed (should really factor out calls to gluProject)
- get rid of sorting by texture in favor of sorting by matrix (no sort needed, geometry is already matrix sorted as a result of frustum cull tree traversal order)
- unroll matrix sync inner loop and cache MVP and normal matrices
2011-10-07 03:12:11 -05:00
Dave Parks
a2d08a6d80
SH-2244 Fix "RenderGLCoreProfile" actually make a core profile context and modify viewer to run under said context without generating errors.
2011-09-22 00:10:57 -05:00
Dave Parks
66acb932ba
SH-2244 Add "RenderGLCoreProfile" debug setting that allows the viewer to start with a non-compatibility-profile OpenGL context.
2011-09-20 03:34:09 -05:00
Dave Parks
4f99ace069
SH-2243 work in progress -- put back ambient lighting when atmospheric shaders disabled.
2011-09-17 00:19:19 -05:00
Dave Parks
4fea7dcb3e
SH-2243 work in progress -- use a hash check to avoid redundantly setting light state
2011-09-15 17:10:33 -05:00
Dave Parks
24ae2fb5af
SH-2243 work in progress -- don't use built-in GL light state when shaders are available.
2011-09-15 16:38:31 -05:00
Dave Parks
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
Dave Parks
c0ca2c62fd
merge
2011-09-13 16:11:22 -05:00
Xiaohong Bao
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
Dave Parks
14f6bbadef
SH-2242 Work in progress migrating to glVertexAttrib everywhere
2011-08-08 15:29:23 -05:00
Dave Parks
6469f1c2f2
SH-2031 High risk changeset, but potentially high reward. Addresses frame stalls in renderer by never using the fixed function pipeline if shaders are available.
2011-07-17 00:24:08 -05:00
Xiaohong Bao
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
Dave Parks
51bb3c15c8
SH-469 WIP -- get rid of LLMultiSampleBuffer and use GL_ARB_texture_multisample instead.
2011-05-19 20:38:39 -05:00
Xiaohong Bao
844bf22d25
apply private pool to VBO
2011-02-23 19:48:08 -07:00
Dave Parks
9e0ee4dff0
SH-1006 Quick pass at cutting down the number of redundant GL calls based on data from gDEBugger.
...
Reviewed by Nyx.
2011-02-17 17:18:57 -06:00
Oz Linden
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
Tofu Linden
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
Tofu Linden
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
Oz Linden
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
Richard Linden
50d8cc6d37
first pass ui rendering performance improvements
2010-07-23 22:07:15 -07:00
Richard Linden
6cc6f81678
first pass ui rendering performance improvements
2010-07-23 22:07:15 -07:00
Tofu Linden
b214180ac1
a better fix for the blend-factor init problem. I think.
2010-02-13 13:55:41 +00:00
Tofu Linden
0604715af6
Add support for glBlendFuncSeparate().
...
I want it to fix glow-through-alpha, but this checkin doesn't includes any of those changes.
2010-03-07 18:31:32 +00:00
Tofu Linden
b307d020a8
Add support for glBlendFuncSeparate().
...
I want it to fix glow-through-alpha, but this checkin doesn't includes any of those changes.
2010-03-07 18:31:32 +00:00
Dave Parks
4538bdd8e9
Fix for bad GL blend function caching.
2010-02-06 20:50:49 -06:00
Palmer Truelson
7885748497
Turning back on Davep's ui optimizations. Backed out changeset 6c161782dba3
2010-02-23 17:08:06 -08:00