Commit Graph

196 Commits (cc577bfa3988982c4f989097d7af0e40d3e466ae)

Author SHA1 Message Date
Ansariel cc577bfa39 Merge viewer-eep 2019-03-31 10:59:37 +02:00
Geenz 0272c47e5a Tweaked naming a bit, also white space.
Will wait for a response from @graham_linden regarding moving the sRGB conversion functions in llmath.h to llrender.
2019-03-29 11:57:45 -07:00
Geenz 57d88a8a98 Gamma correction pass 2:
Make sure lights are in the correct color space.
Bonus: cache the sRGB color in setLightColor on point and spot lights.  Frees up a pow and some multiplies on the CPU every frame.
2019-03-29 08:11:56 -07:00
Graham Linden 446afe2d1a Make whether the sun or moon is primary part of llrender light state so we can set uniforms for shaders along with other light params.
Fix atten calcs to not use abs val.
2019-03-26 08:21:53 -07:00
Ansariel 7fdc689a85 Merge viewer-eep 2019-03-21 20:54:50 +01:00
Ansariel 772924252b Merge viewer-eep 2019-02-28 23:38:39 +01:00
Graham Linden 788a108384 SL-10501
Fix broken matrix management code causing modelview mats to be used as tex anim mats
(do not depend on default matrix mode already being set).

Give the deferred terrain shader a name.

Make LLRender use the eMatrixMode enum instead of ints.
2019-02-21 16:03:46 -08:00
Ansariel f8ad1551b3 Merge viewer-eep 2019-02-10 13:12:23 +01:00
Graham Linden 0a7bc35335 Replace funcs dropped in merge. 2019-02-08 13:19:45 -08:00
Graham Linden 90f9078d1f SL-10486, SL-10501, SL-10487
Make moon texture from default daycycle the default moon texture id and use it for the default and blank assets in the picker.

Fix handling of MM_TEXTURE to correctly detect when texture units outside the range 0-3
are used with texture matrix ops to prevent mem overwrite bug and/or asserts.
2019-02-07 16:00:21 -08:00
Graham Linden 9a007cceef SL-10461
Pass projector ambiance as the .w element of the light_attenuation uniform
so that alpha shader can emulate the behavior of proper spot projectors.
2019-02-04 12:56:11 -08:00
Graham Linden a10ec81e82 SL-10743, SL-10744
Don't step on SUNLIGHT_COLOR uniform w/ syncLightState competing set.

Put drawpool alpha render loop lighting setup changes as they were
(this will give back some performance and possibly require reopening 10566).
2019-03-15 08:13:04 -07:00
Ansariel c699f816d1 Merge viewer-eep 2018-11-16 00:22:32 +01:00
Graham Linden 536799d07e SL-9977
SL-9973
2018-10-29 23:02:20 +01:00
Ansariel 1733550573 Merge viewer-eep 2018-09-22 00:42:04 +02:00
Graham Linden 451ab80ca6 Fix tex format mismatch between what libatmosphere was generating and what we were claiming to use in rendering.
First pass at sky shader using libatmosphere sky radiance lookup.

Add atmo density controls to ext daycycle floater tabs.
2018-09-06 22:50:26 +01:00
Graham Linden d5c465b4ab MAINT-8817 remove automatic update of inv_proj matrix so sunLightF which expects it not to match the projection mat works again
Fix misspellinging in missing settings asset notification string

Fix moon quat conversion to get proper directional rotation

Add early out so attempting to set parcel env settings doesn't crash
2018-06-29 20:15:10 +01:00
Rider Linden 610a793aa8 EOL in llsetingssky.cpp and llrender.cpp. const on ptr_t & in llenvironment 2018-06-05 11:19:22 -07:00
Graham Linden 8cfdc07e79 Code cleanup and move to using typedefs of S64Seconds/F64Seconds for ease in sync w/ sim side which has not llunits types. 2018-06-01 23:32:30 +01:00
Graham Linden graham@lindenlab.com 3116416fcb Le Merge 2018-05-01 00:10:11 +01:00
Ansariel c4e18fbcaa Merge viewer-neko 2018-02-27 18:08:48 +01:00
Graham Linden graham@lindenlab.com 99b82d9449 Atmospherics WIP
libatmosphere integrated in indra/llrender/llatmosphere.cpp

Still working on runtime shaders to use libatmosphere precomputed atmospherics textures
2018-02-18 15:52:23 +00: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 e7715f7a31 Merge Firestorm LGPL 2017-11-30 20:33:07 +01:00
Ansariel 66a7a9b7a6 Make some use of new vertex buffer checks 2017-11-12 13:57:52 +01:00
Nicky 9d0d42c22b Merge with FS tip. 2017-05-10 21:25:21 +02:00
Ansariel 1c543fc781 Replace GL_TEXTURE_RECTANGLE_ARB with GL_TEXTURE_RECTANGLE 2017-04-27 10:07:20 +02:00
Ansariel 13e89be3a5 Reset all VertexBuffer during TP 2017-04-26 16:04:06 +02:00
Nicky b556384baf Merge with viewer64. 2017-04-10 15:20:58 +02:00
Callum Prentice 7c5e92cec5 SL-644 Add guard to mCount in LLRender.cpp 2017-03-13 11:13:43 -07:00
Ansariel 0c4c1b5968 Remove deprecated OpenGL QUADS rendering mode 2017-03-04 23:57:37 +01:00
Nicky 6d3df79ea9 Merge #3 with lgpl. 2017-02-06 12:07:45 +01:00
Nat Goodspeed 434f0e161a Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-02-03 09:54:52 -05:00
Nicky 2290d5ed16 Merge with viewer64, first pass. 2017-01-10 19:33:15 +01:00
Callum Prentice 067468885a BUG-41027 (FIX) Changing login location at the login screen crashes the viewer 2016-12-15 10:58:23 -08:00
Ansariel c182741596 Merge viewer-lynx 2016-11-16 09:55:54 +01:00
andreykproductengine 3c9181867f MAINT-6905 reducing log spam 2016-11-04 16:18:35 +02:00
Nicky c4e21cf282 Fix a crash is drawn vertices is 0.
(transplanted from 89b3e585218ddb8d6a3e62af29f8daf889371e5e)
2016-04-24 12:55:13 +02:00
ruslantproductengine eebbda288d Backed out changeset: 5fe5ad059c05 2016-07-18 20:09:18 +03:00
callum_linden 05fcb7c812 Automated merge with tip of viewer-release 2016-05-23 16:50:56 -07:00
ruslantproductengine 1b5af4be29 Add invert texture coordinates for media textures. 2016-05-13 18:47:23 +03: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
ruslantproductengine 799d13269a MAINT-3585 FIXED Viewer Crashes when attempting to upload image.
The bug was fixed, the reasone of crash is following. The Core Flow view
contain another GL context and will not care about restoring a previous.
I restore context manually.
This path also contain a minor changes in another files.

All changes described here.

Сhange's for fix current bug.
indra/llwindow/llwindow.h
indra/llwindow/llwindowheadless.h
indra/llwindow/llwindowmacosx.h
indra/llwindow/llwindowsdl.h
indra/llwindow/llwindowwin32.h
indra/newview/lllocalbitmaps.cpp
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.h

Twice mUsage initialization (replace to forward initialization).
indra/llcharacter/lljointstate.h

Looks like condition should be befor memcopy call, otherwise - possible CRASH.
indra/llcommon/llmd5.cpp

Unused condition and variables.
indra/llmath/llsphere.cpp

Looks like should be under if otherwise - possible CRASH
indra\llprimitive\llmodel.cpp

Useless assert's.
indra/llrender/llrender.cpp
indra/newview/lldaycyclemanager.cpp
2014-11-03 20:05:20 +02:00
ruslantproductengine b008385a50 FIRE-12732/MAINT-3585 FIXED Viewer Crashes when attempting to upload image
on OS X.
The bug was fixed, the reasone of crash is following. The Core Flow view
contain another GL context and will not care about restoring a previous.
I restore context manually.
This path also contain a minor changes in another files.

All changes described here.

Change's for fix current bug.
indra/llwindow/llwindow.h
indra/llwindow/llwindowheadless.h
indra/llwindow/llwindowmacosx.h
indra/llwindow/llwindowsdl.h
indra/llwindow/llwindowwin32.h
indra/newview/lllocalbitmaps.cpp
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.h

Twice mUsage initialization (replace to forward initialization).
indra/llcharacter/lljointstate.h

Looks like condition should be befor memcopy call, otherwise - possible CRASH.
indra/llcommon/llmd5.cpp

Unused condition and variables.
indra/llmath/llsphere.cpp

Looks like should be under if otherwise - possible CRASH
indra\llprimitive\llmodel.cpp

Useless assert's.
indra/llrender/llrender.cpp
indra/newview/lldaycyclemanager.cpp
2014-11-03 20:05:20 +02:00
Ansariel e52d57cba2 Merge LL V3.7.23 2015-01-15 15:44:43 +01:00
ruslantproductengine d47efdfe03 MAINT-3964 FIXED Textures with Alpha won't Animate on Rigged Mesh when worn : fix in shader (mul texcoord to tex matrix), array's optimization 2014-09-10 21:08:08 +03:00
Tank_Master 6095a2072d more deprecated call fixes (llmsg -> LL_MSG() / llendl -> LL_ENDL) 2014-06-10 08:01:16 -07:00