fcdb198a62
Merge viewer-cougar
2019-12-13 17:15:37 +01:00
74904f39e1
SL-1130 Prevent crash on mMatrix
2019-11-29 18:31:50 +02:00
ccea567c08
Merge viewer-eep
2019-06-19 20:20:14 +02:00
e9dbee0026
SL-11238
...
Fix ambient light inputs to the renderer.
Fix 3rd sky shader w/ mistaken density mod conversion.
Make ambient clamp apply to all modes.
Tune ALM ambient clamp to match non-ALM.
2019-05-21 16:00:45 -07:00
95baae0235
Merge viewer-eep
2019-05-09 18:48:19 +02:00
676aa1398c
Merge viewer-eep
2019-05-08 19:18:01 +02:00
a1e8042c1f
SL-11055, SL-10966, SL-11087
...
Make haze look more like WL.
Make lack of sun and moon mean black and fixed dir to prevent spooky underlighting.
2019-05-07 15:36:43 -07:00
c4032528af
Roll back sRGB decode changes from contrib for now.
...
Fix direct light matching across alpha/blended-material/deferred.
Get diffuse lighting to match from Low to Ultra.
2019-05-02 13:49:35 -07:00
52019b64e8
Merge viewer-eep
2019-04-03 18:45:39 +02:00
cc577bfa39
Merge viewer-eep
2019-03-31 10:59:37 +02:00
a158c87957
Hide sRGB decode behind a flag, and make sure that sRGB decodes is strictly opt-in.
2019-03-30 17:22:54 -07:00
2513aa0ed1
Additional gamma correction work: start moving over to EXT_texture_sRGB_decode.
2019-03-30 03:18:02 -07:00
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
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
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
7fdc689a85
Merge viewer-eep
2019-03-21 20:54:50 +01:00
772924252b
Merge viewer-eep
2019-02-28 23:38:39 +01:00
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
f8ad1551b3
Merge viewer-eep
2019-02-10 13:12:23 +01:00
0a7bc35335
Replace funcs dropped in merge.
2019-02-08 13:19:45 -08:00
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
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
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
c699f816d1
Merge viewer-eep
2018-11-16 00:22:32 +01:00
536799d07e
SL-9977
...
SL-9973
2018-10-29 23:02:20 +01:00
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
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
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
610a793aa8
EOL in llsetingssky.cpp and llrender.cpp. const on ptr_t & in llenvironment
2018-06-05 11:19:22 -07:00
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
3116416fcb
Le Merge
2018-05-01 00:10:11 +01:00
c4e18fbcaa
Merge viewer-neko
2018-02-27 18:08:48 +01:00
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
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
e7715f7a31
Merge Firestorm LGPL
2017-11-30 20:33:07 +01:00
66a7a9b7a6
Make some use of new vertex buffer checks
2017-11-12 13:57:52 +01:00
9d0d42c22b
Merge with FS tip.
2017-05-10 21:25:21 +02:00
1c543fc781
Replace GL_TEXTURE_RECTANGLE_ARB with GL_TEXTURE_RECTANGLE
2017-04-27 10:07:20 +02:00
13e89be3a5
Reset all VertexBuffer during TP
2017-04-26 16:04:06 +02:00
b556384baf
Merge with viewer64.
2017-04-10 15:20:58 +02:00
7c5e92cec5
SL-644 Add guard to mCount in LLRender.cpp
2017-03-13 11:13:43 -07:00
0c4c1b5968
Remove deprecated OpenGL QUADS rendering mode
2017-03-04 23:57:37 +01:00
6d3df79ea9
Merge #3 with lgpl.
2017-02-06 12:07:45 +01:00
434f0e161a
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-02-03 09:54:52 -05:00
2290d5ed16
Merge with viewer64, first pass.
2017-01-10 19:33:15 +01:00
067468885a
BUG-41027 (FIX) Changing login location at the login screen crashes the viewer
2016-12-15 10:58:23 -08:00
c182741596
Merge viewer-lynx
2016-11-16 09:55:54 +01:00
3c9181867f
MAINT-6905 reducing log spam
2016-11-04 16:18:35 +02:00
c4e21cf282
Fix a crash is drawn vertices is 0.
...
(transplanted from 89b3e585218ddb8d6a3e62af29f8daf889371e5e)
2016-04-24 12:55:13 +02:00
eebbda288d
Backed out changeset: 5fe5ad059c05
2016-07-18 20:09:18 +03:00
05fcb7c812
Automated merge with tip of viewer-release
2016-05-23 16:50:56 -07:00
1b5af4be29
Add invert texture coordinates for media textures.
2016-05-13 18:47:23 +03:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
a45d3d8421
Merge Viewer-Bear
2015-06-20 15:35:15 +02:00
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
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
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
e52d57cba2
Merge LL V3.7.23
2015-01-15 15:44:43 +01:00
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
6095a2072d
more deprecated call fixes (llmsg -> LL_MSG() / llendl -> LL_ENDL)
2014-06-10 08:01:16 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
8c91463476
FIRE-12968; Even though the root cause is likely the shader memory overrun, preseed the VBO pools to take some strain from the driver. Remove the LLStrider changes while at it, those are not used in the Havok version and have not triggered anything in the OS version since month.
2014-03-10 00:45:41 +01:00
021dba83af
MAINT-3359 Don't check for LLGLSLShader::sNoFixedFunction as we don't want to loose ui colours(depending on enabled/disabled basic shader).
2013-10-30 14:26:11 +02:00
962f90dbbb
Backed out changeset 577f38970ed9 - Fix coming up...
2014-02-07 07:59:41 +01:00
28b1297e50
Backed out changeset: 54055f06639f - causes FIRE-12858
...
-disabling Basic shaders now makes the UI practically unusable
2014-02-06 19:40:34 -08:00
dfa6822b34
MAINT-3359 Don't check for LLGLSLShader::sNoFixedFunction as we don't want to loose ui colours(depending on enabled/disabled basic shader).
2013-10-30 14:26:11 +02:00
7fdf010d6a
Fix for random bad colors in UI on Intel HD 4000
2013-10-08 14:43:10 -05:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
71e986b059
NORSPEC-285 fix merge error with attenuation on alpha masquerading as this norspec from wayback
2013-09-23 14:49:10 -07:00
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07:00
0ab4e11223
Fix for random bad colors in UI on Intel HD 4000
2013-10-08 14:43:10 -05:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
d6d2f74fbb
NORSPEC-290 Shader optimization WIP -- compatibility pass with OpenGL 3.3, slight cleanup.
2013-07-01 16:27:20 -05:00
7df863265f
NORSPEC-290 Shader optimization WIP -- remove a couple normalizes, pows, and divides from various lighting functions.
2013-06-28 13:32:01 -05:00
380785e613
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-27 16:16:56 -05:00
c603eb5ece
MAINT-318 prevent crashes from incomplete quads and lines and prevent drivers from crashing to desktop when passed short buffers
2013-06-17 08:03:32 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
c978364e1e
for SH-4133: create a debug tool to show textures in active fetching
2013-04-22 22:11:41 -06:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
586025bde5
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-03-04 18:06:29 -06:00
609ed855e1
MAINT-2371 More optimizations.
...
Reviewed by Graham
2013-03-04 18:01:42 -06:00
4e81a84abd
Performance improvements. Faster threadsaferefcount, faster instancetracker, use hashtable and pre-hashed strings for GLSL uniform lookup, and use dup_handles curl interface to avoid re-initing ares resolvers expensively.
2013-03-04 08:57:58 -08:00
f5e5396c3a
MAINT-2371 First set of profile guided optimizations.
...
Reviewed by Graham
2013-02-26 15:15:08 -06:00
2fd0e6e8f9
Merge viewer-cat and resolve conflict with alternate self
2013-02-21 16:50:04 -08:00
f67087b872
MAINT-2370 Add debug setting "RenderAutoMuteRenderCostLimit" that automatically visually mutes avatars above a certain threshold (adjusted by Avatar Mesh Detail Slider)
2013-02-20 19:30:46 -06:00
119ce81029
Merge viewer bear updates + merge fixes
2013-09-23 22:10:59 -07:00
0c314a0e6f
Merge LGPL
2013-09-21 16:59:50 -07:00
05ad3a1c29
Merge Viewer-bear (merge of materials + fixes) to FS-exp
2013-09-21 11:44:46 -07:00
5519c39beb
Merge Viewer-bear (Materials 3.6.6 RC)
2013-09-16 16:18:33 -07:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
af17cbce9f
Forgot the #ifdefs for the Havok enabled version, so setCount of llstrider is only called on non Havok builds.
2013-04-20 03:31:54 +02:00
6bfe9a8686
Protect VBOs against buffer overflows: Need to set striders to their correct size.
2013-03-26 23:00:35 +01:00
49caededb4
BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa
2012-09-19 17:05:56 +00:00
Ansariel