c8f558f677
SH-2240 Better fix for red moon -- stop special casing "highlight_color" as a parameter.
2011-11-10 11:39:08 -06:00
2179e1c1f2
SH-2541 Fix for speckles on avatar on some cards -- don't use "maximum_alpha" for alpha tests in shaders as it was always being set to 1.0 anyway.
2011-11-02 13:13:38 -05:00
ccf751e78e
SH-2370 Fix for alpha masked objects not getting highlighted when highlight transparent enabled.
2011-09-29 23:28:51 -05:00
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
7821ff23ba
SH-2242 Physics shape display works again, added asserts to flush out areas where state being consumed by a shader does not match state being provided by vertex buffers.
2011-08-27 00:38:53 -05:00
2ee8154780
SH-2238, SH-2223, SH-SH-2242 glVertexAttrib throughout main render pipeline complete, preview renders and debug displays still pending. Also fixed a render glitch and a crash (JIRAs listed).
2011-08-10 13:01:14 -05:00
14f6bbadef
SH-2242 Work in progress migrating to glVertexAttrib everywhere
2011-08-08 15:29:23 -05:00
8ec39da346
SH-2181 Fix for alpha flickering when basic shaders enabled (don't use glAlphaFunc when shaders are available).
...
Reviewed by Leslie
2011-07-29 17:46:16 -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
ccb3ad9000
merge changes for storm-1485
2011-07-08 09:25:41 -04:00
de37474429
SH-1918 Fix for highlight transparent not working when basic shaders enabled.
2011-07-05 13:59:32 -05:00
13de92740e
merge latest viewer-development
2011-06-22 11:45:43 -04:00
66fdaf5135
Unused variable
2011-06-08 20:44:24 -05:00
0c6d1f7cf2
SH-1692 Factor out all (but one) of the bindDeferredShader calls in lldrawpoolalpha.
2011-06-08 19:14:49 -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
5d33a55c08
SH-1455 Faster, better, more reliable disabling of DoF effect when edit menu is open and when effect is opted out of.
2011-05-04 16:44:10 -05:00
b98a17c825
SH-1443 Fix for fullbright alpha objects not appearing for some combinations of deferred rendering and non deferred automatic alpha mask toggling.
2011-04-28 16:40:06 -05:00
30763ec707
Fix for DoF effect being busted on transparent surfaces.
2011-03-03 18:31:59 -06:00
b862e3adfa
SH-547 Fix for rigged attachments being invisible in impostors and fix for impostors not working with lighting and shadows enabled.
2011-02-14 18:26:12 -06:00
894dd833f7
Depth of Field whenever "Lighting and Shadows" is enabled and global-illumination is not (experimental).
2010-11-24 03:36:41 -06:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
0655104fa2
EXT-7060 default auto alpha masking to ON for deferred rendering (only deferred rendering)
...
(transplanted from 050ae2c9451a6b89374c5a10403f373e2475f23b)
2010-04-26 14:42:06 +01:00
6de84031ee
VWR-4214 followup
...
Make the fix work for alpha masks ('fast alpha') too - ironically this hasn't ever worked either AFAICT.
2010-03-08 14:51:27 +00:00
5461959d33
fixes VWR-4214 Glow effect passes through alpha textures where alpha is actually "solid"
...
and its many many dupes.
In summary this does the following:
* When laying down alpha, uses the new separated color-and-alpha blend func support to suppress existing glow in proportion to the opacity of the incoming fragments
* Moves glowing-alpha support from the glow pool to the alpha pool, ensures that the glow pass for a vertex buffer happens after the alpha pass for the vertex buffer so that it doesn't suppress its *own* glow.
Tested with all shader modes, FBO on/off, and deferred rendering. Tested with every permutation of alpha/non-alpha/glow/non-glow/fullbright/waterglow/particle interaction I could contrive so far. :)
2010-03-08 12:28:33 +00:00
4ffac61994
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
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
9e51aa3fd6
EXT-7060 default auto alpha masking to ON for deferred rendering (only deferred rendering)
...
(transplanted from 050ae2c9451a6b89374c5a10403f373e2475f23b)
2010-04-26 14:42:06 +01:00
e2fb574d78
VWR-4214 followup
...
Make the fix work for alpha masks ('fast alpha') too - ironically this hasn't ever worked either AFAICT.
2010-03-08 14:51:27 +00:00
6286dad2e9
fixes VWR-4214 Glow effect passes through alpha textures where alpha is actually "solid"
...
and its many many dupes.
In summary this does the following:
* When laying down alpha, uses the new separated color-and-alpha blend func support to suppress existing glow in proportion to the opacity of the incoming fragments
* Moves glowing-alpha support from the glow pool to the alpha pool, ensures that the glow pass for a vertex buffer happens after the alpha pass for the vertex buffer so that it doesn't suppress its *own* glow.
Tested with all shader modes, FBO on/off, and deferred rendering. Tested with every permutation of alpha/non-alpha/glow/non-glow/fullbright/waterglow/particle interaction I could contrive so far. :)
2010-03-08 12:28:33 +00: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
da3ad612df
merge.
2010-02-10 21:00:51 +00:00
efe1f7c6f6
Fix 'fast alpha' option for non-deferred rendering. This is a developer toggle which we don't support as such, but people with old viewers may have it turned on and will experience new artifacts without this fix.
...
Fix is isolated to this fast-alpha case.
2010-02-10 21:00:00 +00:00
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
536e38ad51
Merging render-pipeline-6-qa-2 into viewer-2
...
Self reviewed.
2009-09-22 11:11:45 +00:00
af98aad98d
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3
...
EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
2009-08-26 20:47:27 +00:00
138bf11322
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
...
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +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
939a506569
Merging in file-move-merge ( QAR-649 )
...
Result of "svn merge -r 90669:90786 $tulla/file-move-merge ."
Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing:
newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files)
newview/llpostprocess.* -> llrender/llpostprocess.*
newview/llrendersphere.* -> llrender/llrendersphere.*
newview/llcubemap.* -> llrender/llcubemap.*
llwindow/llgl.* -> llrender/llgl.*
llwindow/llglstates.h -> llrender/llglstates.h
llwindow/llgltypes.h -> llrender/llgltypes.h
llwindow/llglheaders.h -> llrender/llglheaders.h
2008-06-30 17:57:00 +00:00
926ea0b39a
QAR-669 1.20 Viewer RC11
...
QAR-648 1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
2008-06-27 21:02:01 +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
068da0b565
merge release-QAR-511 Viewer 1.20 RC 5
...
merge Branch_1-20-Viewer -r 85828 : 86279 -> release
2008-05-06 18:09:03 +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
Dave Parks