6dd9dd3ab6
MAINT-9064
...
Fix binding of current/next sun/moon textures.
Remove redundant code in GLSLShader determination of tex uniform bindings.
Unhack mix calls in sun/moon shaders to reverse sense of blending (was working around reversed bindings).
2018-08-30 17:54:59 +01:00
a0598b1265
Fix water fog consolidation in underwater shaders.
...
Add plumbing facilities to allow current and next moon textures to be passed to moon shader.
Modify moon shader to blend between current and next moon textures by blend factor.
2018-06-11 17:46:16 +01: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
37e8fd20c3
Merge to 5.1.6
2018-06-01 15:34:21 +01:00
bd84cbfa11
Merge
2018-05-31 11:49:27 -07:00
190fa8614c
Remove MSVC debug pragmas and comment out code to dump example grids.xml file w/ hard-coded grids.
2018-05-18 23:16:56 +01:00
3116416fcb
Le Merge
2018-05-01 00:10:11 +01:00
98b2fed85f
De-duplicate shader code for encoding and decoding normals to/from gbuffer format.
2018-03-12 17:52:04 +01:00
cf460b13be
De-duplicate sRGB conversion funcs from many shaders
...
and unify on using the version that works on OSX.
Add more logging to shader loading about fallbacks and loading succcess.
Add frag shaders for sharing sRGB and normal encode/decode via GL shader linkage.
2018-03-12 16:24:16 +01:00
5517eb3f6f
Remove MSVC pragmas breaking OSX build.
2018-03-03 01:08:58 +00:00
5d924483a8
Merge viewer-cougar
2018-03-02 15:00:48 +01:00
6303ef5763
Redo advanced atmo shader integration with SL.
2018-02-26 16:38:50 +00: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
55990724a3
Keep attributes name (useful for debug)
2018-01-30 17:07:00 +02:00
df376c0299
MAINT-6437 - Tile-Based Texture Animation Scales Incorrectly for Rigged Mesh when worn (MacOS only)
...
FIXED.
2017-12-26 18:20:06 +02:00
547df251e4
Merge viewer64
2017-10-02 17:57:56 +02:00
0d414c1fb5
Clouds still funky but better.
2017-09-26 09:19:20 -07:00
5d3599f5d1
Merge
2017-09-22 09:18:34 -07:00
d4d0520f38
Cleanup inside GLSLShader for uniform mapping.
2017-09-20 14:29:36 -07:00
d1ab470542
DRTVWR-418: Fix C++ errors detected by Xcode 9.
...
You can't legitimately perform an ordered comparison between a pointer and an
int, even 0. Fix a number of 'if (ptr > 0)' to plain 'if (ptr)'.
Fix LLEditWearableDictionary::WearableEntry constructor to avoid varargs
mechanism. It used to accept three different counts, followed by three
different lists of enums, fetched in each case as 'int' -- dubious in itself.
The constructor body performed three different loops to populate those enums
into three different member vectors.
Instead, make the constructor accept three vectors and initialize the member
vectors from the passed vectors. Now that C++ has inline vector
initialization, change existing constructor calls to pass temporary vectors
initialized with what used to be the varargs enum values.
2017-09-20 16:58:58 -04:00
fa8c420112
Partially undo d536fd19aa9d as it causes OpenGL error: glDeleteObjectARB - GL_INVALID_VALUE
2017-03-18 22:22:54 +01:00
18dfdc2ae0
Merge bento-box
2016-11-11 16:00:37 +01:00
5fb30e5ad3
MAINT-6913 - (Via Sovereign Engineer and Shyotl Kuhr) Pack the skinned matrix and translation into a single mat3x4 for optimal data transfer to reduce uniform slot usage.
2016-11-11 09:37:45 -05:00
b547aeef03
Merge with https://bitbucket.org/lindenlab/viewer-vlc
2016-08-01 16:15:47 +02:00
eebbda288d
Backed out changeset: 5fe5ad059c05
2016-07-18 20:09:18 +03:00
e982c273fd
Merge with viewer-release-vlc
2016-05-29 19:27:00 +02: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
a0188a5358
Merge Firestorm LGPL
2016-05-09 12:41:24 +02:00
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
10b73565f2
Merge viewer-bear
2016-04-14 15:07:39 +02:00
48016ff54b
MAINT-6286 Viewer 4.0.3.312680 ignores settings for Shaders in Graphics Preferences for ATI Radeon HD 3800 Series graphics card
2016-04-12 19:29:35 +03:00
d171e16c58
Merge Firestorm LGPL
2016-03-18 10:16:25 +01:00
1bba3dfbe4
Merge viewer-bear
2016-03-17 21:14:49 +01:00
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
173886fec3
MAINT-1109 FIXED Toggling graphics options causes viewer memory to increase, eventually causing the rendering pipeline to fall over and crashing the viewer
...
Patchset #2
2016-03-10 19:50:12 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
e7ade840e4
Merge viewer-bear
2016-01-24 14:00:30 +01:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
cbdf791fb1
MAINT-1109 Toggling graphics options causes viewer memory to increase, eventually causing the rendering pipeline to fall over and crashing the viewer
...
Te reason of memory leak - unloaded shaders.
Fixed.
2015-12-01 19:57:38 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
68739bc569
Merge Viewer-Bear
2015-10-27 01:31:15 +01:00
4f8f739a98
MAINT-3568 Mac OS X, ALM, Full Bright, Shininess
...
The reason of this bug the same as was in MAINT-4165, MAINT-4839.
I.e. in short: SL engine is sensitive to the uniform variable location.
2015-10-02 19:25:05 +03: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
a882d7a02b
Fix for gpu_bench crash without parallels knock-on
2014-11-18 12:54:13 -08:00
9eeb8344a6
Avoid using GL_ARB_timer_query functionality when not supported and protect against probably-not-NULL current bound shader pointer
2014-11-17 11:40:28 -08:00
824bdebd79
Merge LL V3.7.22
2015-01-15 14:17:42 +01:00
93c0ece928
Merge LL v3.7.20
2015-01-15 01:17:02 -08:00
c3466ac315
Backed out changeset: 6e3af080d67a - benchmark code (prep for later mergeing)
2015-01-10 09:43:21 -08:00
d0428575fb
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2014-06-19 13:14:42 -05:00
24f8745914
MAINT-3131 Use benchmark to determine GPU class instead of GPU table.
2014-03-19 17:57:00 -05:00
c82dd52491
MAINT-4678: fix crash on launch in gpu benchmark
2014-11-14 14:16:31 -05:00
fbfd010381
MAINT-3131 Use benchmark to determine GPU class instead of GPU table.
2014-03-19 17:57:00 -05:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
7b2cc02863
Merge LL fitted mesh
2014-02-06 00:41:33 -08:00
ff8b002c3b
Quite down log spam from loading shaders.
...
Up bone cap to 64 for rigged meshes.
2013-10-10 13:56:06 -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
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07: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
f86a7c04d3
NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac 10.6.8 nV driver issues
2013-07-30 11:33:58 -07:00
f357269c38
NORSPEC-325 WIP restore gamma (uncorrected) attenuation and unify sRGB conversion in one place
2013-07-25 09:36:13 -07:00
d6d2f74fbb
NORSPEC-290 Shader optimization WIP -- compatibility pass with OpenGL 3.3, slight cleanup.
2013-07-01 16:27:20 -05:00
d262ca32d3
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-07-01 10:59:46 -05:00
bd41392b7e
Merge with viewer-bear which was just merged with viewer-release
2013-06-28 13:36:41 -07:00
380785e613
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-27 16:16:56 -05:00
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
ccd04cd66c
Occlusion culling overhaul.
2013-06-18 17:24:21 -05:00
473474b949
Revert changes for MAINT-2616 due to licensing issues, need a full patch
...
submitted to be acceptable
2013-05-22 16:51:42 -07:00
abdbf45aaa
MAINT-2616 : Updated my Intel driver and now have orange in buttons and
...
Inventory pull down bar causing blinks to screen. Pulled in FS code,
Reviewed by Kelly
2013-05-20 11:18:12 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
1688e995eb
Provide LLGLSLShader backwards compat so as not to break the appearance utility
2013-04-26 09:11:52 -07:00
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
b2344cfd13
Fix rendering artifacts on Mac Mobile GeForce cards
2013-04-20 03:36:21 -07:00
f964e51fc9
Fix for mac build
2013-04-15 15:31:57 -05:00
8025b8b2bc
NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where available
2013-04-15 13:16:14 -05:00
679a095aa0
NORSPEC-74 Fix for assert when Debug GL enabled when rendering materials.
2013-04-02 15:45:17 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
df08808640
Improve perf of GLSL uniform lookups by name
2013-02-28 09:33:41 -08:00
2ae4b6976b
Added a new draw pool specifically for faces with materials applied to them. Removed materials rendering from the bump draw pool, and reverted it to its previous state.
2013-02-04 11:32:05 -05:00
e551fc5137
Merge LGPL
2013-09-29 20:35:40 -07:00
9810792665
Back out Intel HD 4000 fixes to thoroughly test the latest driver with OGL 4.2 support
...
This driver seems to have fixed the rendering issues.
2013-09-29 16:14:57 -07: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
cec54eddb1
Build fix for 64-bit. Should work on 32-bit builds too.
2013-07-11 11:44:25 -05:00
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
e606677ed8
Added the ability to remove a preprocessor define.
2012-08-29 04:56:54 -04:00
99371f892e
Added new bindTexture and unbindTexture API to LLGLSLShader. Reviewed by davep.
2012-08-28 14:44:28 -04:00
ed1b78e322
Added support for adding custom preprocessor definitions (for shader permutations)
2012-08-28 10:33:32 -04:00
70b77b3dea
FIRE-6855; Rainbow UI for Intel HD (4000) graphics chips. Use a special shader for Intel which does not pass colors as vertex attributes, but an uniform.
2013-01-03 05:03:46 +01:00
67221663fe
MAINT-616 Fix for mac build.
2012-05-30 14:55:34 -05:00
b7cfd8c7f0
MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update
2012-05-21 23:33:25 -05:00
3267b42ee5
SH-2908 Temporary fix for mac build
2012-02-13 18:26:48 -06:00
3710c6110d
SH-2908 Rework indexed texture rendering to use a uvec4 instead of a float for texture indices in the data stream. Also rework gl_FragColor overrides to not collide with some odd driver implementations.
2012-02-10 20:04:19 -06:00
Graham Linden