8ab2169efb
Merge viewer-cougar
2018-08-22 10:15:24 +02:00
3237923e10
MAINT-3699 new shaders supporting alpha blend/mask rigged content.
...
Make shader loading debug logging of uniforms use ShaderUniform to make supression simpler.
2018-08-16 00:31:39 +01:00
5d924483a8
Merge viewer-cougar
2018-03-02 15:00:48 +01: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
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
Ansariel