c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
c4433e4fc8
MAINT-4092 FIXED Prim faces with opaque diffuse maps, with material set to ALPHA_MODE_BLEND, do not render when ALM is enabled
2014-07-09 18:02:01 +03:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -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
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
743d1a777e
NORSPEC-198, NORSPEC-176, NORSPEC-106, NORSPEC-202 et al -- Material matrix testing based overhaul WIP
...
Reviewed by Graham
2013-05-29 18:48:09 -05:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
609ed855e1
MAINT-2371 More optimizations.
...
Reviewed by Graham
2013-03-04 18:01:42 -06:00
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
83f5d0c616
Merge in viewer-development
2012-07-31 15:42:02 -07:00
8df3619621
merge to viewer-developmento
2012-07-24 10:51:37 -04:00
d1c056beba
MAINT-685 Fix for disabling basic shaders making high detail terrain render incorrectly.
2012-07-03 14:35:08 -05:00
2eedd0c3c0
Merge with tip
2012-06-15 13:00:49 -07:00
b93a23aa82
MAINT-1147 Fix for frame stall on region crossing.
2012-06-13 18:05:56 -05:00
096fe03786
MAINT-646 Faster traversal of render batch lists.
2012-06-01 14:27:04 -05:00
92ce47a1b2
Added support to disable a draw pool. When the movable option checkbox is selected we will now also cull the terrain draw pool.
2012-05-09 15:56:06 -04:00
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
14f6bbadef
SH-2242 Work in progress migrating to glVertexAttrib everywhere
2011-08-08 15:29:23 -05:00
6469f1c2f2
SH-2031 High risk changeset, but potentially high reward. Addresses frame stalls in renderer by never using the fixed function pipeline if shaders are available.
2011-07-17 00:24:08 -05:00
13de92740e
merge latest viewer-development
2011-06-22 11:45:43 -04:00
6992dbc1e3
SH-1682 Use GL_ARB_map_buffer_range to mitigate impact of mapping larger vertex buffer objects. Limit number of textures per batch to 6 (prevents frame stalls on NVIDIA).
2011-06-01 23:46:04 -05:00
ece32418e7
SH-1682 Dynamically adjust the number of texture channels to use for indexed texture rendering based on available hardware.
2011-05-31 14:35:59 -05:00
eca17c8993
SH-1682 Full integration if indexed texture rendering to improve batch size.
2011-05-30 01:25:55 -05:00
1fd46831f0
SH-1682 Work in progress on using texture indexes to improve batch size (wow, super fast so far)
2011-05-29 00:40:57 -05:00
0eb13bb682
storm-1189: remove more of the code for classic clouds
2011-05-26 11:30:39 -04:00
225ffbba20
Automated merge up from viewer-development
2010-10-27 15:08:21 -04:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
c7b6ebaf76
Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low altitude flicker though (STORM-306)
2010-09-30 22:57:05 -07:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
f324787a70
Rigged attachment integration WIP.
2010-05-01 00:45:44 -05:00
663725dcee
Remove calls to llpushcallstacks from inner loops.
2010-04-14 12:02:25 -05:00
ea6397fe49
Optimiziation pass.
...
Added RenderUseStreamVBO to enable/disable usage of VBO's for streaming buffers.
Faster traversal of LLCullResult members.
Removal of llpushcallstacks from inner loops.
Sprinkling in fast timers.
2010-03-04 15:30:15 -06:00
eb5b0f2542
Optimiziation pass.
...
Added RenderUseStreamVBO to enable/disable usage of VBO's for streaming buffers.
Faster traversal of LLCullResult members.
Removal of llpushcallstacks from inner loops.
Sprinkling in fast timers.
2010-03-04 15:30:15 -06:00
adf601ef1f
Draw prims using triangle strips instead of triangle lists.
2010-02-06 17:33:12 -06:00
095a5e8440
Draw prims using triangle strips instead of triangle lists.
2010-02-06 17:33:12 -06:00
afe6350160
merge from texture-pipeline
2009-11-06 12:15:41 -08:00
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
b403745bfe
Extra debugging info for EXT-1456
...
Reviewed by Bao
2009-10-27 11:44:23 -07:00
536e38ad51
Merging render-pipeline-6-qa-2 into viewer-2
...
Self reviewed.
2009-09-22 11:11:45 +00:00
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00:00
abdc99f21b
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
...
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
f89f19990c
QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-11-07 17:51:03 +00:00
ad33281007
QAR-650 - Viewer RC 9 merge -> release (post cmake)
...
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
16baf6c9d4
merge release-QAR-499 Viewer 1.20 RC 3
...
merge release-QAR-508 Viewer 1.20 RC 4
merge Branch_1-20-Viewer -r 85278 : 85828 -> release
2008-04-28 23:29:46 +00:00
Oz Linden