4d0ebf6143
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llviewerdisplay.cpp
2023-05-17 18:02:50 +02:00
ee0b330b2d
DRTVWR-559 Decruft deprecated OpenGL flags.
2023-05-16 20:31:29 -05:00
f4182ddc7f
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2023-03-06 17:11:43 +01:00
d0993b7376
SL-19195 Fix for world map tiles not rendering if empty.
2023-02-10 13:31:57 -06:00
87501c03ae
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llrender2dutils.cpp
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/llviewershadermgr.h
2022-09-20 11:37:09 +02:00
718073717c
SL-18128, SL-18128 - No glerror on Mac!
2022-09-19 12:16:49 -07:00
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
b70614bd87
SL-16606: Add profiler category UI
2022-01-14 11:50:21 -08:00
47e2173239
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/pipeline.h
2021-12-16 08:42:54 +01:00
5e5be92d79
SL-16202 Put Multi-threaded GL behind a feature flag and update featuretable (decruftify settings, compatibility pass).
2021-12-06 15:29:34 +00:00
028941652b
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llvertexbuffer.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/pipeline.cpp
2021-12-01 22:29:25 +01:00
68e09edad0
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
2021-11-30 17:04:35 -07:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00:00
caf7f6c1d2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 17:53:39 +01:00
ac94268e5e
Fix OpenGL core profile issue with glLineWidth by Rye Mutt
2020-10-18 02:21:58 +02:00
14fb8f66f8
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2020-09-24 16:34:12 +02:00
177ad21ade
SL-13729 Performance of LLUI and LLRender2D
2020-09-17 19:59:48 +03:00
db344c5844
Fix instance existance check
2019-11-12 16:07:36 +02:00
ce24fab6b1
Fix instance existance check
2019-11-12 16:07:36 +02:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
1233842012
SL-11718 Crash in LLRender2D
2019-08-13 17:22:58 +03:00
1be08814e2
DRTVWR-493 tiny optimization
2019-08-11 12:50:24 +03:00
34d8200d0f
DRTVWR-493 LLRender2D init cleanup
2019-08-10 09:01:54 +03:00
adeee613c6
DRTVWR-493 LLRender2D to LLParamSingleton
2019-07-25 18:20:17 +03:00
00d085c575
Fix copy & paste bug
2017-03-15 23:08:43 +01:00
d19b330deb
Fix vertex windings
2017-03-10 21:31:56 +01:00
3874bf463a
Correct winding order of second triangle so it does not get culled.
2017-03-10 20:43:27 +01:00
0c4c1b5968
Remove deprecated OpenGL QUADS rendering mode
2017-03-04 23:57:37 +01:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
c35801ef1c
fixed focus issue on inventory
2013-11-05 19:26:23 -08:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
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
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
042b7aec26
BUILDFIX: fixed llviewerassetstats test and render2dutils changes
...
that were dropped in merge
2013-06-05 20:25:21 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
1586107e87
SH-3944 WIP CHUI merge fixing
...
re-introduced don's refactor of low-level openGL calls pulling out of llui
and putting them into llrender. Took the new code from their updated versions
from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-12 22:34:15 +00:00
Ansariel