livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,163 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

98 Commits (e46ba2a7068c19ae827df0a4f4eaeade472ee967)

Author SHA1 Message Date
Ansariel 68739bc569 Merge Viewer-Bear 2015-10-27 01:31:15 +01:00
ruslantproductengine 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
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
Graham Linden a882d7a02b Fix for gpu_bench crash without parallels knock-on 2014-11-18 12:54:13 -08:00
Graham Linden 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
Ansariel 824bdebd79 Merge LL V3.7.22 2015-01-15 14:17:42 +01:00
Tank_Master 93c0ece928 Merge LL v3.7.20 2015-01-15 01:17:02 -08:00
Tank_Master c3466ac315 Backed out changeset: 6e3af080d67a - benchmark code (prep for later mergeing) 2015-01-10 09:43:21 -08:00
Dave Parks d0428575fb Automated merge with http://bitbucket.org/lindenlab/viewer-release 2014-06-19 13:14:42 -05:00
Dave Parks 24f8745914 MAINT-3131 Use benchmark to determine GPU class instead of GPU table. 2014-03-19 17:57:00 -05:00
Oz Linden c82dd52491 MAINT-4678: fix crash on launch in gpu benchmark 2014-11-14 14:16:31 -05:00
Dave Parks fbfd010381 MAINT-3131 Use benchmark to determine GPU class instead of GPU table. 2014-03-19 17:57:00 -05:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
Tank_Master 7b2cc02863 Merge LL fitted mesh 2014-02-06 00:41:33 -08:00
Dave Parks ff8b002c3b Quite down log spam from loading shaders. 
Up bone cap to 64 for rigged meshes.
 2013-10-10 13:56:06 -05:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden 59628d6f85 Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-10-01 14:28:39 -07:00
Graham Linden 95e34d86b9 The unbearable lightness of being norspec 2013-09-18 18:24:16 -07:00
Richard Linden e340009fc5 second phase summer cleaning 
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
 2013-08-09 17:11:19 -07:00
Graham Madarasz (Graham Linden) 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
Graham Linden f357269c38 NORSPEC-325 WIP restore gamma (uncorrected) attenuation and unify sRGB conversion in one place 2013-07-25 09:36:13 -07:00
Dave Parks d6d2f74fbb NORSPEC-290 Shader optimization WIP -- compatibility pass with OpenGL 3.3, slight cleanup. 2013-07-01 16:27:20 -05:00
Dave Parks d262ca32d3 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2013-07-01 10:59:46 -05:00
callum_linden bd41392b7e Merge with viewer-bear which was just merged with viewer-release 2013-06-28 13:36:41 -07:00
Dave Parks 380785e613 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-27 16:16:56 -05:00
Dave Parks 79029149a4 Automated merge with file:///F:%5Cviewer-bear 2013-06-21 12:51:29 -05:00
Dave Parks ccd04cd66c Occlusion culling overhaul. 2013-06-18 17:24:21 -05:00
simon 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
simon 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
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Graham Madarasz 1688e995eb Provide LLGLSLShader backwards compat so as not to break the appearance utility 2013-04-26 09:11:52 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
Graham Madarasz b2344cfd13 Fix rendering artifacts on Mac Mobile GeForce cards 2013-04-20 03:36:21 -07:00
Dave Parks f964e51fc9 Fix for mac build 2013-04-15 15:31:57 -05:00
Dave Parks 8025b8b2bc NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where available 2013-04-15 13:16:14 -05:00
Dave Parks 679a095aa0 NORSPEC-74 Fix for assert when Debug GL enabled when rendering materials. 2013-04-02 15:45:17 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Graham Madarasz (Graham) df08808640 Improve perf of GLSL uniform lookups by name 2013-02-28 09:33:41 -08:00
Geenz 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
Tank_Master e551fc5137 Merge LGPL 2013-09-29 20:35:40 -07:00
Tank_Master 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
Tank_Master 119ce81029 Merge viewer bear updates + merge fixes 2013-09-23 22:10:59 -07:00
Tank_Master 0c314a0e6f Merge LGPL 2013-09-21 16:59:50 -07:00
Tank_Master 05ad3a1c29 Merge Viewer-bear (merge of materials + fixes) to FS-exp 2013-09-21 11:44:46 -07:00
Tank_Master 5519c39beb Merge Viewer-bear (Materials 3.6.6 RC) 2013-09-16 16:18:33 -07:00
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Tonya Souther cec54eddb1 Build fix for 64-bit. Should work on 32-bit builds too. 2013-07-11 11:44:25 -05:00
Tank_Master 718f6fa0ff merge LL 3.6.1 2013-07-10 00:23:23 -07:00