Ansariel
3f331bb24c
Merge Firestorm LGPL
2018-05-18 10:32:56 +02:00
AndreyL ProductEngine
64b3473f49
Merged in lindenlab/viewer-release
2018-05-18 03:02:44 +03:00
Ansariel
5d924483a8
Merge viewer-cougar
2018-03-02 15:00:48 +01:00
AndreyL ProductEngine
af9069edbf
Merged in lindenlab/viewer-release
2018-03-02 00:47:08 +02:00
ruslantproductengine
0f690ab4da
Add const
2018-01-30 17:07:27 +02:00
Ansariel
25350b9422
Merge viewer-neko
2018-01-30 15:39:28 +01:00
Andrey Kleshchev
6e445e82e2
MAINT-8091 Removed deprecated and unused private memory pooling
2018-01-30 14:03:26 +00:00
Ansariel
a6cc739aa7
Merge
2018-01-29 21:00:02 +01:00
Ansariel
1dfdbe2d03
Merge Firestorm LGPL
2018-01-29 20:58:22 +01:00
Ansariel
7a69b2b353
Proposed fix for mesh physics view crashes on OpenSim with physic shapes exceeding 65536 vertices
2018-01-29 14:54:41 +01:00
Ansariel
0b6176dea9
Merge Firestorm LGPL
2018-01-25 21:57:38 +01:00
Ansariel
f6e3684f6e
Merge Firestorm LGPL
2018-01-17 12:07:54 +01:00
AndreyL ProductEngine
15c62d9e71
Merged in lindenlab/viewer-bear
2018-01-17 03:58:24 +02:00
AndreyL ProductEngine
57a99273ed
Merged in lindenlab/viewer-release
2018-01-17 03:20:12 +02:00
Ansariel
98569f84a2
Merge viewer-neko
2018-01-13 19:11:09 +01:00
andreykproductengine
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
Ansariel
e41bdfc820
Merge viewer-neko
2017-12-20 23:07:38 +01:00
andreykproductengine
1f56b223d7
MAINT-8101 Added sanity check to confirm crash location
2017-12-18 15:15:54 +02:00
Ansariel
e7715f7a31
Merge Firestorm LGPL
2017-11-30 20:33:07 +01:00
Nat Goodspeed
e3a2c5e321
DRTVWR-418: Merge from latest viewer-release
2017-11-29 14:47:09 -05:00
Ansariel
56855c63f7
Merge Firestorm LGPL
2017-11-29 23:04:58 +01:00
Ansariel
914e18c491
Merge viewer-neko
2017-11-18 17:06:52 +01:00
Ansariel
cff7981132
Merge viewer-lynx
2017-11-18 15:19:02 +01:00
andreykproductengine
e1a94df865
MAINT-72 unmapBuffer crash
2017-11-17 17:33:10 +02:00
andreykproductengine
8da9e0ffd7
MAINT-72 unmapBuffer crash
2017-11-17 17:33:10 +02:00
andreykproductengine
5a402dbc1f
MAINT-7228 Vertex buffer allocation failure handling
2017-11-16 17:11:48 +02:00
Ansariel
66a7a9b7a6
Make some use of new vertex buffer checks
2017-11-12 13:57:52 +01:00
Ansariel
c606bc3492
Merge viewer-lynx
2017-11-12 12:28:28 +01:00
andreykproductengine
e848127f23
MAINT-7228 Substituted assert with error
2017-11-03 19:27:09 +02:00
andreykproductengine
149b2d88dd
MAINT-7228 Vertex buffer allocation failure handling
2017-11-01 19:36:13 +02:00
AndreyL ProductEngine
8c03881193
Merged in lindenlab/viewer-lynx
2017-11-22 16:44:36 +02:00
Ansariel
c47b8c27ba
Merge Firestorm LGPL
2017-08-23 17:53:48 +02:00
Ansariel
0d9b019b42
Merge viewer-neko
2017-08-23 09:34:24 +02:00
Oz Linden
01e0b78c59
merge changes for DRTVWR-439
2017-08-16 15:43:58 -04:00
AndreyL ProductEngine
cf865bb596
MAINT-7652 Fix for crash in LLVertexBuffer::~LLVertexBuffer() destructor
2017-08-09 00:04:25 +03:00
Ansariel
2f42fd5262
Merge LL viewer release 5.0.7
2017-08-23 00:39:27 +02:00
Nicky
9d0d42c22b
Merge with FS tip.
2017-05-10 21:25:21 +02:00
Ansariel
969078e0e5
Fix GL error GL_INVALID_OPERATION in VertexAttribPointerARB
2017-04-27 11:00:14 +02:00
Ansariel
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
Nicky
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
Ansariel
4008d821d1
Use a vbo for the static LLVertexBuffer::drawArray/Element functions; by Drake Arconis/Shyotl Kuhr
2017-03-05 14:27:24 +01:00
Ansariel
2a1d8b4632
Vectorized Weight4Strider and ClothWeightStrider by Drake Arconis (Alchemy Viewer)
2017-03-05 13:18:13 +01:00
Ansariel
a3f5dbde12
Infinite loop fix when OpenGL debugging is enabled; by Drake Arconis (Alchemy Viewer)
2017-03-05 12:31:01 +01:00
Ansariel
0c4c1b5968
Remove deprecated OpenGL QUADS rendering mode
2017-03-04 23:57:37 +01:00
Nicky
4ff3d43ee8
Merge #7 with lgpl.
2017-02-06 12:26:14 +01:00
Nicky
45ecc629c6
Just a little x64 fix.
2017-02-03 16:08:18 +01:00
Nicky
2290d5ed16
Merge with viewer64, first pass.
2017-01-10 19:33:15 +01:00
Nat Goodspeed
fd79bb9c7d
DRTVWR-418: Merge backout of TYPE_INDEX / TYPE_MAX change
2016-12-17 11:09:48 -05:00
Nat Goodspeed
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
Nat Goodspeed
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
Nat Goodspeed
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
Nat Goodspeed
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
AndreyL ProductEngine
71269ac1fc
Backed out changeset: ebe10b4b1197
2016-12-15 02:40:51 +02:00
ruslantproductengine
65161e6b39
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
ruslantproductengine
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
Nat Goodspeed
434f0e161a
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-02-03 09:54:52 -05:00
ruslantproductengine
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
ruslantproductengine
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
Ansariel
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
Oz Linden
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
Ansariel
d2c3f41e1e
Crash fix due to invalid calls to drawElements by Drake Arconis
2015-07-17 12:08:09 +02:00
Graham Linden
de2fe42a52
Attempt wider disable of using profile API when timer query is not present
2014-11-17 14:54:00 -08:00
Ansariel
824bdebd79
Merge LL V3.7.22
2015-01-15 14:17:42 +01:00
Tank_Master
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
Nicky
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
Xiaohong Bao
0c60e32808
Merge
2013-10-21 16:57:38 -06:00
Richard Linden
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
Richard Linden
1acceb3633
changed ll_aligned_(malloc|free) to take alignment size as a template argument
2013-10-14 10:18:41 -07:00
Dave Parks
0e116741a0
MAINT-2968 Fix for crash on AMD hardware running current drivers.
2013-10-10 18:00:11 -05:00
Richard Linden
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
Richard Linden
754e8752a9
added initial memory usage tracking for lltrace
2013-10-03 14:30:34 -07:00
Richard Linden
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
Richard Linden
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
Graham Linden
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07:00
Richard Linden
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
Graham Linden
8675ed0491
Fix merge regressions from missed changes to LoD updates
2013-08-19 16:04:28 -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 Linden
42ce98e8bf
NORSPEC-314 cleanup debug-only code...seems to fix NORSPEC-328 as well somehow
2013-07-30 13:44:12 -07:00
Graham Madarasz (Graham Linden)
b44e7303d8
NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on Mac
2013-07-29 18:59:45 -07:00
Graham Linden
1587999b03
Add info to vert buffer warnings to track down fullbright alpha mask crasher
2013-07-16 12:03:42 -07:00
Dave Parks
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
Richard Linden
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
Richard Linden
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
Dave Parks
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
simon
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
Graham Madarasz
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
Oz Linden
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
Graham Madarasz
e40bcc4e16
NORSPEC-59 and NORSPEC-133 work-around crash with RenderDebugGL on and fix breakage in shaders from Mac changes
2013-04-17 09:05:40 -07: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
simon
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
Dave Parks
679a095aa0
NORSPEC-74 Fix for assert when Debug GL enabled when rendering materials.
2013-04-02 15:45:17 -05:00
Dave Parks
fc4869fb78
NORSPEC-65 Hook up texture offset/scale/rotation for normal and specular maps.
2013-03-29 16:13:36 -05:00
Graham Madarasz
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
Dave Parks
9a7a19c77a
Merge
2013-03-13 17:13:45 -05:00
Dave Parks
08ae21f52d
MAINT-2410 Extra Particle Parameters -- viewer implementation
...
Reviewed by Kelly and Graham
2013-03-13 17:07:22 -05:00
Graham Madarasz (Graham Linden)
35383790fb
Merge pragma warning hack to fix linux build
2013-03-12 04:40:51 -07:00
Dave Parks
609ed855e1
MAINT-2371 More optimizations.
...
Reviewed by Graham
2013-03-04 18:01:42 -06:00
Dave Parks
f5e5396c3a
MAINT-2371 First set of profile guided optimizations.
...
Reviewed by Graham
2013-02-26 15:15:08 -06:00
Nyx Linden
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Tank_Master
33922af1fa
Merge LL release
2013-11-01 19:52:14 -07:00
Tank_Master
5e2324b5d3
Backed out changeset: f632d5a3a4e3 - has unwanted side effects
2013-10-17 23:46:34 -07:00
Dave Parks
ecbdb4948f
MAINT-2968 Fix for crash on AMD hardware running current drivers.
2013-10-10 18:00:11 -05:00
Ansariel
319f0fbcc6
Fix merge error in llvertexbuffer.cpp
2013-10-07 22:43:30 +02: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
Nicky
de2c9af677
Backout of c0f5f3933a72. That call is likely okay and the driver crash is due to some other reason way before that.
2013-08-26 22:16:42 +02:00
Nicky
3b0f5a01da
Don't let glBufferSubDataARB read/write beyond buffer boundaries.
2013-08-10 22:46:31 +02:00
Tank_Master
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
Tank_Master
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
Nicky
4d70926425
Performance; Remove FastTimers from Vertexbuffer (hot code path) found by Zwagoth (NACL) & me.
2013-04-24 01:15:29 +02:00
Nicky
af17cbce9f
Forgot the #ifdefs for the Havok enabled version, so setCount of llstrider is only called on non Havok builds.
2013-04-20 03:31:54 +02:00
Nicky
0d4ecdefa4
Protect VBOs against buffer overflows.
2013-03-25 16:19:47 +01:00
simon@Simon-PC.lindenlab.com
40e78a80cc
Pull and merge viewer-development
2012-12-04 14:31:15 -08:00
prep
e0432f98ee
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
2012-11-28 16:36:34 -05:00
Dave Parks
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
Richard Linden
c0224cc47a
merge with viewer-development
2012-11-19 19:06:36 -08:00
Richard Linden
9d77e030d9
SH-3406 WIP convert fast timers to lltrace system
...
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08:00
simon@Simon-PC.lindenlab.com
d6e3b0445a
Merge in viewer-development code and fix build
2012-10-15 14:23:29 -07:00
Don Kjer
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
Don Kjer
19e43e4b58
Added fast timers for baked texture rendering. Updated appearance utility
2012-10-06 08:08:52 +00:00
William Todd Stinson
c6a2ac0489
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20 19:43:54 -07:00
Nyx Linden
49caededb4
BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa
2012-09-19 17:05:56 +00:00
William Todd Stinson
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
simon@Simon-PC.lindenlab.com
83f5d0c616
Merge in viewer-development
2012-07-31 15:42:02 -07:00
Oz Linden
509408f393
merge back beta fixes for DRTVWR-180
2012-07-14 09:30:09 -04:00
Tank_Master
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
Tank_Master
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
Tank_Master
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
Tank_Master
cc44316aed
Merge LL 3.4.3,
...
Note: aligned some of our code with LL's, spcifically feature table, gpu table, texture fetching, and some rendering defaults behavior.
2012-12-18 00:36:35 -08:00
Tank_Master
5b5f4c8bf5
Merge LL 3.4.2 release,
...
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
Tank_Master
9f4245779c
Partial Merge of LL 3.4.2 Release
2012-12-10 15:56:46 -08:00
Nicky
2b620b006b
Disable caching of vbo memory in LLVBOPool. Had been there once and it was a memory hog, now it's back and it's again keeping massive amounts of memory
2012-11-02 00:05:28 +01:00
simon@Simon-PC.lindenlab.com
56d563ba7f
Fix merge issues - duplicate insertions of code
2012-07-11 17:14:25 -07:00
simon@Simon-PC.lindenlab.com
173d0fa213
Pull in viewer-development because it's painful. Merge with runitai's help.
2012-07-11 16:15:23 -07:00
Dave Parks
e86b1c18db
MAINT-794 Fix for assert on loading some types of objects before their parents.
2012-07-11 15:17:13 -05:00
Dave Parks
997b360747
MAINT-794 Fix for assert on loading some types of objects before their parents.
2012-07-11 15:17:13 -05:00
simon@Simon-PC.lindenlab.com
b7555a3309
Merge back viewer-lion, which has viewer-development and down-stream fixes
2012-08-01 14:07:24 -07:00
Dave Parks
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
Dave Parks
9e9d32de38
merge
2012-06-22 14:04:33 -05:00
Nicky
b43e29ee66
Reapplied after merge: Fix for GCC 4.6.3 when compiling 64 bit.
2012-06-10 23:13:50 +02:00
Nicky
c1e6caf23a
Backed out changeset 0cb6e34b68e5. Talked with Tonya, this needs a slightly different fix.
2012-10-14 22:02:33 +02:00
Tonya Souther
a88d1372ee
Pass the address of an array element to a function expecting a pointer.
2012-10-14 14:09:48 -05:00
Nicky
034cbbdc95
User-defined names was deprecated with OpenGL 3.1. Just generate/delete using OpenGL function.
2012-09-26 21:00:25 +02:00
Tank_Master
999bd2130e
Merge LL 3.4.0 release
2012-09-13 15:19:30 -07:00
Tank_Master
d9c7b9253d
merge LL 3.4.0 viewer-beta
2012-08-31 00:18:30 -07:00
Tank_Master
8cb09ca444
Merge to FS LGPL 29865
2012-08-30 15:45:02 -07:00
Tank_Master
cb24ec2e0d
merge LL 3.3.4 beta
...
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
2012-07-16 21:59:14 -07:00
Aura Linden
0fd3ff972d
MAINT-1142 use VBO pooling on OSX
2012-06-04 12:15:08 -07:00
Nicky
e0b334c615
Crashfix; Change llassert_always to llassert + llwarns. This way users don't get disruptive crashes.
2012-07-21 14:18:10 +02:00
Dave Parks
67221663fe
MAINT-616 Fix for mac build.
2012-05-30 14:55:34 -05:00
Dave Parks
2e26dc3971
Minor instrumentation tweaks -- add a couple of asserts, a timer, and fix VBO accounting.
2012-05-30 13:22:04 -05:00
Dave Parks
efda0814cb
MAINT-616 Fix for corrupted mipmaps. Cleanup based on code review feedback.
2012-05-24 10:50:48 -05:00
Dave Parks
78df56e1b5
MAINT-616 Fix for crash on teleport from previous changes
2012-05-22 13:49:52 -05:00
Dave Parks
534168c452
MAINT-616 Fix for crash on shutdown caused by previous changes.
2012-05-22 00:49:07 -05:00
Dave Parks
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
Dave Parks
89b0b6ac71
MAINT-616 Different VBO Pooling scheme -- populate VBO pool with buffers that are likely to be requested, but never reuse a previously used buffer.
2012-05-15 16:42:04 -05:00
Nicky
aca20e85fb
Crashfix; Change llassert_always to llassert + llwarns. This way users don't get disruptive crashes.
2012-07-21 14:18:10 +02:00
Dave Parks
3894701180
MAINT-708 Fix for pink when enabling RenderUseVAO
2012-03-14 16:13:23 -05:00
Dave Parks
3953477ee5
MAINT-708 Reduce amount of video memory consumed by vertex buffer objects.
2012-03-13 17:34:11 -05:00
Tank_Master
991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
Tank_Master
1c55d5cbb6
Merge LL 3.3.2 release
2012-05-28 17:02:11 -07:00
Dave Parks
4f26a67c0f
MAINT-708 Fix for pink when enabling RenderUseVAO
2012-03-14 16:13:23 -05:00
Dave Parks
2e1067dd32
MAINT-708 Reduce amount of video memory consumed by vertex buffer objects.
2012-03-13 17:34:11 -05:00
Dave Parks
a128836ded
SH-2908 Fix for linux build.
2012-02-23 13:41:19 -06:00
Dave Parks
3efa013ee4
MAINT-939 Potential fix for crash when editing objects.
2012-04-13 11:55:44 -05:00
Dave Parks
484994b43b
MAINT-870 Fix for crash from out of control lawns.
2012-04-11 12:20:03 -05:00
Tank_Master
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
Tank_Master
e07191cb7f
Backed out changeset: cab3e59e0834 (LL has a different fix for this)
2012-04-22 21:02:40 -07:00
Dave Parks
64c89ee2c5
SH-2908 Fix for mac build
2012-02-13 15:41:21 -06:00
Dave Parks
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
Leslie Linden
ae7d475aeb
SH-2794, resolved merge conflict and corrected logic in LLVertexBuffer::determineUsage() to work the way it used to.
2012-02-06 12:43:23 -08:00
Brad Payne (Vir Linden)
344c46a20c
merge, conflicts in llvertexbuffer.{h,cpp}
2012-02-06 15:08:41 -05:00
Nicky
5741b71e89
FIRE-5077; remove hardcoded limit for max. 65535 (U16 max) for broader testing.
2012-02-27 00:43:07 +01:00
Dave Parks
17b21fc197
Fix for windows build
2012-01-26 12:50:24 -06:00
Leslie Linden
71a660e006
* Fixed up shader compilation errors to get lighting and shadows working again on Mac.
...
* Cleaned up vertex buffer allocation to guarantee allocation and deallocation using the same allocation methods from the same pools.
* Added new shader feature for atmospheric helpers in the absence of lighting.
Reviewed by davep.
2012-01-26 10:17:41 -08:00
Dave Parks
0bbe8d73cb
SH-2565 Move resetVertexBuffer operation to a consistent location (also avoid redundant resetting of vertex buffers on detail switches). Change assertion to a warning with count info. Fix bytes pooled debug display. Remove unused static vertex buffer.
2012-01-25 15:37:36 -06:00
Dave Parks
655505d304
SH-2794 Fix for bad textures on some hardware when vbo mapping disabled (always use GL_STREAM_DRAW as the usage hint when mapping is disabled as geometry will be uploaded again and again)
2012-01-19 14:57:07 -06:00
Dave Parks
0c1fc78bd9
SH-2794 Map buffer now performs as well as buffersubdata
2012-01-18 12:40:11 -06:00
Nicky
9f7c9cffa3
Merge up to 26380 / 19ccfae26929 (V/dev tip).
2012-02-02 19:38:24 +01:00
Nicky
70a35d5722
Don't use mFreeList in LLVertexBuffer. It only grows, never shrinks.
2012-01-27 21:03:37 +01:00
Dave Parks
5546041301
SH-2794 WIP -- work on getting glMapBuffer and friends to behave
2011-12-21 15:55:14 -06:00
Richard Linden
c191f523a9
Automated merge with http://hg.secondlife.com/viewer-development
2011-11-30 17:57:09 -08:00
Richard Linden
d089e6c264
bumped up MSVC warning level to 3 to catch more stuff that gcc catches
2011-11-28 19:16:49 -08:00
Dave Parks
5c690db63f
SH-2700 Fix for random black textures due to texture index out of bounds. Also change shader to show bright pink on index out of bounds and add assertions to help prevent this sort of bug in the future.
2011-11-18 15:04:26 -06:00
Dave Parks
e82c0561fa
SH-2652 Faster depth of field
2011-11-04 16:14:43 -05:00
Dave Parks
4ec72ed0a6
Fix for VBO pools not getting cleared appropriately.
2011-10-19 16:19:00 -05:00
Dave Parks
7b6723d1e0
SH-1650 Mitigate memory fragmentation by holding onto and reusing VBOs
2011-10-13 01:19:45 -05:00
Dave Parks
ae0cd901f8
SH-2428 Make GCC 4.4 happy by using LLVector4a striders with LLAlphaObject subclasses -- also vectorize particle VBO updates
2011-10-04 17:25:55 -05:00
Dave Parks
c4aa8c50da
SH-2447, SH-2525, SH-2276 Strip out defunct global illumination code, add accounting for how much memory is taken up by LLRenderTarget, fix crash on login in bindGLIndices (work around driver bug that doesn't respect VAO state WRT to index buffers), remove some unused render targets, remove some unused shaders, make it possible to run a fullscreen session
2011-10-04 02:31:54 -05:00
Dave Parks
ac37656aa5
SH-2276 Fix for failed assertions reported from debug-enabled viewers. Also, remove "Basic Shaders" as a user settable option (shaders are always on if GL version >= 2.0, always off otherwise)
2011-10-02 02:12:21 -05:00
Dave Parks
1e9a492431
SH-2276 disable private memory pool management
2011-09-29 13:10:38 -05:00
Dave Parks
5ca512fa1f
SH-2450 Potential fix for crash on GeForce 4xx when allocating LLVertexBuffer data
2011-09-28 12:38:31 -05:00
Dave Parks
54ba56dbe9
SH-2244 changes to run in a core context on AMD hardware without generating deprecation or performance warnings
2011-09-26 18:31:55 -05:00
Dave Parks
56191701bc
SH-2244 Fix for crash when enabling core profile on AMD GPUs
2011-09-25 02:43:43 -05:00
Dave Parks
4f2b20a30d
SH-2244 Fix for mac build? (take two)
2011-09-23 20:47:55 -05:00
Dave Parks
4821a22070
SH-2244 Fix for mac build?
2011-09-23 18:29:38 -05:00
Dave Parks
57620a9da9
SH-2244 Vertex buffer cleanup, fix for bad vertices in rigged attachments, added "RenderUseVAO" debug setting to control whether or not to use VAO's in non-core GL profiles.
2011-09-23 17:59:05 -05:00