c47b8c27ba
Merge Firestorm LGPL
2017-08-23 17:53:48 +02:00
2f42fd5262
Merge LL viewer release 5.0.7
2017-08-23 00:39:27 +02:00
cf865bb596
MAINT-7652 Fix for crash in LLVertexBuffer::~LLVertexBuffer() destructor
2017-08-09 00:04:25 +03:00
9d0d42c22b
Merge with FS tip.
2017-05-10 21:25:21 +02:00
969078e0e5
Fix GL error GL_INVALID_OPERATION in VertexAttribPointerARB
2017-04-27 11:00:14 +02:00
6585ed272a
FIRE-21101: Use alternative shader setup for particles in OpenGL compatibility profile to fix performance issue with crappy implemented particle crap
2017-04-22 11:34:52 +02:00
b64d68b10f
Make sure glow works when using VAOs.
...
- Use emissive shader in LLDrawPoolAlpha::renderAlpha (like LL does)
- Make sure LLVertexBuffer::setBuffer calls setupClientArrays with the new attrib mask, otherwise dissabled attrib arrays will stay disabled and never get enabled.
2017-03-22 00:02:25 +01:00
4008d821d1
Use a vbo for the static LLVertexBuffer::drawArray/Element functions; by Drake Arconis/Shyotl Kuhr
2017-03-05 14:27:24 +01:00
2a1d8b4632
Vectorized Weight4Strider and ClothWeightStrider by Drake Arconis (Alchemy Viewer)
2017-03-05 13:18:13 +01:00
a3f5dbde12
Infinite loop fix when OpenGL debugging is enabled; by Drake Arconis (Alchemy Viewer)
2017-03-05 12:31:01 +01:00
0c4c1b5968
Remove deprecated OpenGL QUADS rendering mode
2017-03-04 23:57:37 +01:00
4ff3d43ee8
Merge #7 with lgpl.
2017-02-06 12:26:14 +01:00
45ecc629c6
Just a little x64 fix.
2017-02-03 16:08:18 +01:00
2290d5ed16
Merge with viewer64, first pass.
2017-01-10 19:33:15 +01:00
fd79bb9c7d
DRTVWR-418: Merge backout of TYPE_INDEX / TYPE_MAX change
2016-12-17 11:09:48 -05:00
4c95587dc3
Backed out changeset bb47510bda62: don't change TYPE_MAX.
...
Ruslan points out that changing TYPE_MAX could lead to extra (useless) render
passes. We will have to solve the TYPE_INDEX > TYPE_MAX problem another way.
2016-12-17 11:09:09 -05:00
1298961066
DRTVWR-418: Update dubious llvertexbuffer.cpp cast comment.
...
Ruslan assures me that in fact this usage is valid.
2016-12-17 11:07:20 -05:00
c1ae63a872
DRTVWR-418: Work around dubious cast from S32 to GLvoid*
...
when passing -- something -- to glVertexAttribPointerARB() in
LLVertexBuffer::setupVertexArray().
2016-12-16 19:08:24 -05:00
93268cb47a
DRTVWR-418: Put TYPE_INDEX within TYPE_MAX: stop undefined indexing.
...
LLVertexBuffer::TYPE_INDEX was past TYPE_MAX, which is used to set the maximum
sizes of various (scattered) arrays, bleh. The alarm bells that this SHOULD
set off are indeed correct: TYPE_INDEX was being used to index at least one of
those arrays, meaning we've been indexing past the end of that array, meaning
undefined behavior.
The enum that defines both TYPE_INDEX and TYPE_MAX provides a helpful comment
indicating what things must be updated when modifying the enum. (Far better to
define things centrally in a single place... but another time.) Update the
designated arrays to include a final TYPE_INDEX entry. Contents of those
entries are wild guesses -- but even wild guesses are better than completely
indeterminate data.
2016-12-16 17:03:45 -05:00
71269ac1fc
Backed out changeset: ebe10b4b1197
2016-12-15 02:40:51 +02:00
5cc716dbf9
MAINT-6125 - Mesh avatar deforms constantly
...
MAINT-6910 - [MAINT-RC] Some mesh turns invisible when camera is moved on the Maint-RC viewer only - caused by fix for MAINT-6125.
Commulative fix.
Fixed for booth ticket's in indra/newview/llvovolume.cpp
Remained fixed, it's a small code improvements which is not related to
MAINT-6125, MAINT-6910
2016-12-12 18:24:46 +02:00
25c20f98a8
MAINT-5018 crashing when touching mesh
...
Fix #1 Disable FSAA for drawing selected objects (it help to avoid crash on
old ATI cards (in my case it's a HD3800)).
2016-08-05 17:21:22 +03:00
0149e1912a
MAINT-5018 crashing when touching mesh
...
Fix #1 Disable FSAA for drawing selected objects (it help to avoid crash on
old ATI cards (in my case it's a HD3800)).
2016-08-05 17:21:22 +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
d2c3f41e1e
Crash fix due to invalid calls to drawElements by Drake Arconis
2015-07-17 12:08:09 +02:00
de2fe42a52
Attempt wider disable of using profile API when timer query is not present
2014-11-17 14:54:00 -08:00
824bdebd79
Merge LL V3.7.22
2015-01-15 14:17:42 +01:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -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
0c60e32808
Merge
2013-10-21 16:57:38 -06:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
1acceb3633
changed ll_aligned_(malloc|free) to take alignment size as a template argument
2013-10-14 10:18:41 -07:00
0e116741a0
MAINT-2968 Fix for crash on AMD hardware running current drivers.
2013-10-10 18:00:11 -05:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
754e8752a9
added initial memory usage tracking for lltrace
2013-10-03 14:30:34 -07:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
12f0f8cb72
changed over to manual naming of MemTrackable stats
...
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
2013-10-01 13:46:43 -07:00
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
8675ed0491
Fix merge regressions from missed changes to LoD updates
2013-08-19 16:04:28 -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
42ce98e8bf
NORSPEC-314 cleanup debug-only code...seems to fix NORSPEC-328 as well somehow
2013-07-30 13:44:12 -07:00
b44e7303d8
NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on Mac
2013-07-29 18:59:45 -07:00
1587999b03
Add info to vert buffer warnings to track down fullbright alpha mask crasher
2013-07-16 12:03:42 -07:00
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
c3f14b915c
NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric)
2013-06-03 12:50:48 -05:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
Ansariel