summaryrefslogtreecommitdiff
path: root/indra/llrender/llgl.cpp
AgeCommit message (Collapse)Author
2010-10-27Automated merge from viewer-development-shiningLoren Shih
2010-10-12add a debug function to output gl error information to the log file without ↵Xiaohong Bao
crashing the viewer. No need to test because there are no negative effects.
2010-09-30Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low ↵Merov Linden
altitude flicker though (STORM-306)
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-24Final(???) merge from viewer-release to viewer-public.Tofu Linden
2010-08-23added a toggle "LLGLManager::mDebugGPU" for debugging certain CPUs.Xiaohong Bao
added more debug code for EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-07-30further UI rendering performance improvementsRichard Nelson
2010-04-22Let GL errors be caught on Linux - don't know why this was disabled.Tofu Linden
(transplanted from a149524a63039870704a498952d9bb3aa599b472)
2010-04-20Make assert_glerror not a hotspot.Dave Parks
(transplanted from 8476304a30a3c387a722b33743ef3385e85f85a0)
2010-03-08Remove a '#error XXX' I was using to test ifdef-hell.Tofu Linden
2010-03-07Add support for glBlendFuncSeparate().Tofu Linden
I want it to fix glow-through-alpha, but this checkin doesn't includes any of those changes.
2010-02-03CID-293 DefectTofu Linden
Checker: UNINIT_CTOR Function: LLGLManager::LLGLManager() File: /indra/llrender/llgl.cpp --HG-- branch : product-engine
2010-01-11EXT-3784 Fix for first menu item going blank when highlighted on ATI cards.Runitai
2009-09-30QAR-1619: merge up to 2009-09-26 viewer/viewer-20Nat Goodspeed
2009-09-23Getting rid of "gl used while not active" test until such time as it is ↵David Parks
needed/useful (when threading is revisited).
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
Self reviewed.
2009-06-22Merge with viewer-2.0.0-3 branchBryan O'Sullivan
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-05-22DEV-27646 dll linkage for login module.Brad Kittenbrink
Ok, finally got this to a point where it doesn't break the build and I can check in. llcommon can be built as a shared library (disabled but can be enabled with cmake cache var LLCOMMON_LINK_SHARED. reviewed by Mani on tuesday (I still need to get his suggested changes re-reviewed)
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵Brad Kittenbrink
(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-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew.
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-05svn merge -r106715:HEAD ↵Kent Quirk
svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
2008-12-23QAR-1142 merging 1.22 RC0-RC4 changes.Mark Palange
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
merge viewer_1-21 94770-96059 -> release
2008-08-28merge viewer/viewer_1-21 94170-94770 -> releaseSteven Bennetts
merge viewer/viewer_1-21-0 94830-95157 -> release Includes: QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki! QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
2008-06-30Merging in file-move-merge ( QAR-649 )Eric Tulla
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