25350b9422
Merge viewer-neko
2018-01-30 15:39:28 +01:00
6e445e82e2
MAINT-8091 Removed deprecated and unused private memory pooling
2018-01-30 14:03:26 +00:00
a6cc739aa7
Merge
2018-01-29 21:00:02 +01:00
1dfdbe2d03
Merge Firestorm LGPL
2018-01-29 20:58:22 +01:00
7a69b2b353
Proposed fix for mesh physics view crashes on OpenSim with physic shapes exceeding 65536 vertices
2018-01-29 14:54:41 +01:00
0b6176dea9
Merge Firestorm LGPL
2018-01-25 21:57:38 +01:00
f6e3684f6e
Merge Firestorm LGPL
2018-01-17 12:07:54 +01:00
15c62d9e71
Merged in lindenlab/viewer-bear
2018-01-17 03:58:24 +02:00
57a99273ed
Merged in lindenlab/viewer-release
2018-01-17 03:20:12 +02:00
98569f84a2
Merge viewer-neko
2018-01-13 19:11:09 +01:00
56c878925a
MAINT-7003 Crash in LLVBOPool
...
Error to help figuring out if error happens due to gl or memory issue
2018-01-12 18:54:20 +02:00
e41bdfc820
Merge viewer-neko
2017-12-20 23:07:38 +01:00
1f56b223d7
MAINT-8101 Added sanity check to confirm crash location
2017-12-18 15:15:54 +02:00
e7715f7a31
Merge Firestorm LGPL
2017-11-30 20:33:07 +01:00
e3a2c5e321
DRTVWR-418: Merge from latest viewer-release
2017-11-29 14:47:09 -05:00
56855c63f7
Merge Firestorm LGPL
2017-11-29 23:04:58 +01:00
914e18c491
Merge viewer-neko
2017-11-18 17:06:52 +01:00
cff7981132
Merge viewer-lynx
2017-11-18 15:19:02 +01:00
e1a94df865
MAINT-72 unmapBuffer crash
2017-11-17 17:33:10 +02:00
8da9e0ffd7
MAINT-72 unmapBuffer crash
2017-11-17 17:33:10 +02:00
5a402dbc1f
MAINT-7228 Vertex buffer allocation failure handling
2017-11-16 17:11:48 +02:00
66a7a9b7a6
Make some use of new vertex buffer checks
2017-11-12 13:57:52 +01:00
c606bc3492
Merge viewer-lynx
2017-11-12 12:28:28 +01:00
e848127f23
MAINT-7228 Substituted assert with error
2017-11-03 19:27:09 +02:00
149b2d88dd
MAINT-7228 Vertex buffer allocation failure handling
2017-11-01 19:36:13 +02:00
8c03881193
Merged in lindenlab/viewer-lynx
2017-11-22 16:44:36 +02:00
c47b8c27ba
Merge Firestorm LGPL
2017-08-23 17:53:48 +02:00
0d9b019b42
Merge viewer-neko
2017-08-23 09:34:24 +02:00
01e0b78c59
merge changes for DRTVWR-439
2017-08-16 15:43:58 -04:00
cf865bb596
MAINT-7652 Fix for crash in LLVertexBuffer::~LLVertexBuffer() destructor
2017-08-09 00:04:25 +03:00
2f42fd5262
Merge LL viewer release 5.0.7
2017-08-23 00:39:27 +02: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
434f0e161a
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-02-03 09:54:52 -05:00
Ansariel