2fea1d5d33
Integrate SIMD API from oreh/server-trunk-oreh
2010-08-19 12:25:15 -05:00
f40d07512a
finish conversion to ll_aligned_*() wrappers
2010-06-04 09:04:36 +01:00
1655256c0c
UI rendering optimization.
2010-05-29 04:18:44 -05:00
49579bebdd
Fix for wierd triangle shadow bug and fix for ATI hating deferred rendering.
2010-05-10 13:00:36 -05:00
8424ceb20f
merge
2010-03-20 16:59:41 -05:00
d2996b6859
EXT-6276 Fix for UI going all wonky.
2010-03-12 13:17:30 -06:00
58afe469f9
Bizarrely hacky fix for EXT-6276 (#if LL_DARWIN out copyFromPrimarySubstring)
...
General gl state cleanup in llui.
Make llrender more gGL.begin/end friendly.
2010-03-12 13:01:50 -06:00
f5c431aa7b
EXT-6276 Put in some gl flush calls to texture state functions.
2010-03-11 16:06:36 -06:00
9aefe34998
EXT-6276 Put in some gl flush calls to register combiner functions (why these are being used for UI now is beyond me)
2010-03-11 15:19:27 -06:00
80ab668f44
Add support for glBlendFuncSeparate().
...
I want it to fix glow-through-alpha, but this checkin doesn't includes any of those changes.
2010-03-07 18:31:32 +00:00
2aab1d33e1
gah, more blending fixing.
2010-02-13 14:45:34 +00:00
848f0ad183
a better fix for the blend-factor init problem. I think.
2010-02-13 13:55:41 +00:00
257347b8f8
restore blend factor init fix.
2010-02-13 12:54:24 +00:00
4f4afcf489
merge backout.
2010-02-13 12:50:06 +00:00
f5572abb5e
Backed out changeset 6c161782dba3
2010-02-13 12:49:54 +00:00
f0062fa41a
merge from viewer2. this fucks up davep's optimizations, so I'll backout their backout next to restore them. I hope. Sheesh.
2010-02-13 12:46:14 +00:00
660c3b182c
merge
2010-02-12 21:05:09 -08:00
651b14fcae
Backed out davep's UI optimization. changeset 3134cb7bb181
2010-02-12 21:04:51 -08:00
b214180ac1
a better fix for the blend-factor init problem. I think.
2010-02-13 13:55:41 +00:00
b8739946be
Fix for blend func being screwed up at init.
...
Fix for avatar appearance editor drawing hair in the background.
2010-02-08 19:15:43 -06:00
cf9972b971
Fix for blend func being screwed up at init.
...
Fix for avatar appearance editor drawing hair in the background.
2010-02-08 19:15:43 -06:00
4538bdd8e9
Fix for bad GL blend function caching.
2010-02-06 20:50:49 -06:00
ce504224de
Fix for bad GL blend function caching.
2010-02-06 20:50:49 -06:00
54a95f706f
merge
2010-02-23 17:19:58 -08:00
7885748497
Turning back on Davep's ui optimizations. Backed out changeset 6c161782dba3
2010-02-23 17:08:06 -08:00
ff0271d632
merge
2010-02-04 23:43:13 -06:00
979ddb2ec9
No more matrix ops in UI code.
2010-02-04 23:41:54 -06:00
36be134aee
CID-292
...
Checker: UNINIT_CTOR
Function: LLRender::LLRender()
File: /indra/llrender/llrender.cpp
2010-02-03 18:38:52 +00:00
2a00a16f57
EXT-3784 Fix for first menu item going blank when highlighted on ATI cards.
2010-01-11 11:21:52 -06: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
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
6db6d81b0a
Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).
...
No conflicts in the merge.
Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
2009-03-05 00:29:27 +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
446c55538e
svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/
...
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
2009-01-13 03:46:56 +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
fb793870fe
QAR-1142 merging 1.22 RC0-RC4 changes.
...
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-23 19:39:58 +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
da94c0eaa2
QAR-855 Viewer 1.21 RC 2
...
merge viewer_1-21 94770-96059 -> release
2008-09-12 06:27:13 +00:00
80be4c1d2d
QAR-767 Combined maint-render-7 and maint-viewer-9 merge
...
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +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
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
Dave Parks