summaryrefslogtreecommitdiff
path: root/indra/llrender
AgeCommit message (Collapse)Author
2013-02-12merge up to 3.4.5-releaseOz Linden
2013-02-07For MAINT-1291 Code Review: DavePGraham Madarasz
2013-02-04Added a new draw pool specifically for faces with materials applied to them. ↵Geenz
Removed materials rendering from the bump draw pool, and reverted it to its previous state.
2013-01-30merge downstream code from viewer-lionsimon@Simon-PC.lindenlab.com
2013-01-30Specular map support. This is the vast majority of the material parameters ↵Geenz
implemented at this point for opaque geometry.
2013-01-25Trying to set materials up for rendering! Yay!Geenz
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-11Initial (largely complete) gamma correct rendering implementation.Geenz
2013-01-07MergeGeenz
2012-12-20SH-3344 WIP - additional debugging output for avatar local texturesBrad Payne (Vir Linden)
2012-12-18MAINT-2150 Fix for super-large ( > 4096 ) snapshots having black bordersDave Parks
2012-12-11Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-12-11Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentLogan Dethrow
2012-12-07Check to see if GL_EXT_texture_sRGB and GL_ARB_framebuffer_sRGB are available.Geenz
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-21Pull and merge https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-13Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-10-15Merge in viewer-development code and fix buildsimon@Simon-PC.lindenlab.com
2012-10-15Speeding up cmake configuration, especially on linux. Re-arranged ↵Don Kjer
llrender/llwindow cmake source a bit
2012-10-13Pulling in viewer-gcc4.6 freetype fixesDon Kjer
2012-10-12Fix for 'no text in release builds' problemBrad Payne (Vir Linden)
2012-10-11Fix for release build in gcc 4.6Don Kjer
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-10-09Pull and merge from ↵William Todd Stinson
ssh://hg@bitbucket.org/lindenlab/viewer-development-materials.
2012-10-06Added fast timers for baked texture rendering. Updated appearance utilityDon Kjer
2012-10-04Turning on mHasShaderObjects for mesa headlessDon Kjer
2012-10-04Building headless and non-headless libraries side-by-side, removing the need ↵Don Kjer
for the BAKING cmake setting.
2012-10-04Removing server-related cmake cruft. Fixing libGLU warnings on linux.Don Kjer
2012-10-04Adding optimization to skip alpha image analysis when it isn't needed.Don Kjer
2012-09-25Wrapping failing llgl assert in gDebugGLDon Kjer
2012-09-23Removing unused gHeadlessClient code from viewerDon Kjer
2012-09-22Fix for missing symbols on windows buildsDon Kjer
2012-09-20Pull and merge from ↵William Todd Stinson
ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20BUILDFIX: not including headless libraries if we haven't defined ↵Nyx Linden
llrenderheadless
2012-09-20reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing.Dave Parks
2012-09-19BUILDFIX: enabling the building of the viewer/appearance backend with ↵Nyx Linden
headless mesa
2012-09-13Fix for merge build error. Attempt to cleanup cmake warnings regarding ↵Don Kjer
incorrect target_link_libraries
2012-09-13Fleshed out target_link_libraries dependencies between libraries. ↵Don Kjer
Appearance utility now reads avatar_lad.xml during stubbed out params processing.
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-09-08Removed most llappearance -> llui dependencies (LLTrans remains). Moved ↵Don Kjer
LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.
2012-11-14Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-10-10Introduce new LLDir::findSkinnedFilenames() method. Use as needed.Nat Goodspeed
In a number of different places, for different reasons, the viewer wants to load a UI-related file that might be overridden by a non-default skin; and within that skin, might further be overridden by a non-default language. Apparently, for each of those use cases, every individual developer approached it as an entirely new problem, solving it idiosyncratically for that one case. Not only is this a maintenance problem, but it rubs one's nose in the fact that most such solutions consider only a subset of the relevant skin directories. Richard and I evolved an API intended to address all such cases: a central LLDir method returning a list of relevant pathnames, from most general to most localized, filtered to present only existing files; plus a couple of convenience methods to specifically obtain the most general and most localized available file. There were several load-skinned-file methods (LLFloater::buildFromFile(), LLPanel::buildFromFile() and LLUICtrlFactory::createFromFile() -- apparently cloned-and-modified from each other) that contained funky bolted-on logic to output the loaded data to an optional passed LLXMLNodePtr param. The trouble is that passing that param forced each of these methods to subvert its normal search: specifically for that case, it needed to find the baseline XML file instead of the localized one. Richard agreed that for the intended usage (reformatting XML files) we should use XML schema instead, and that the hacky functionality should be removed. Remove it. Also remove LLUICtrlFactory::getLocalizedXMLNode(), only used for those three special cases. Some callers explicitly passed the optional LLXMLNodePtr param as NULL. Remove that. Remove LLFloaterUIPreview::displayFloater(save) param, which relied on the optional output LLXMLNodePtr param. Make onClickSaveFloater() and onClickSaveAll() emit popupAndPrintWarning() about discontinued functionality. Recast LLFloater::buildFromFile(), LLPanel::buildFromFile(), LLUICtrlFactory::createFromFile(), LLNotifications::loadTemplates(), LLUI::locateSkin(), LLFontRegistry::parseFontInfo(), LLUIColorTable::loadFromSettings(), LLUICtrlFactory::loadWidgetTemplate(), LLUICtrlFactory::getLayeredXMLNode(), LLUIImageList::initFromFile(), LLAppViewer::launchUpdater() and LLMediaCtrl::navigateToLocalPage() to use findSkinnedFilenames(). (Is LLAppViewer::launchUpdater() ever called any more? Apparently so -- though the linux-updater.bin logic to process the relevant command-line switch has been disabled. Shrug.) (Is LLMediaCtrl::navigateToLocalPage() ever used?? If so, why?) Remove LLUI::setupPaths(), getXUIPaths(), getSkinPath() and getLocalizedSkinPath(). Remove the skins/paths.xml file read by setupPaths(). The only configuration it contained was the pair of partial paths "xui/en" and "xui/[LANGUAGE]" -- hardly likely to change. getSkinPath() specifically returned the first of these, while getLocalizedSkinPath() specifically returned the second. This knowledge is now embedded in findSkinnedFilenames(). Also remove paths.xml from viewer_manifest.py. Remove injected xui_paths from LLFontGL::initClass() and LLFontRegistry::LLFontRegistry(). These are no longer needed since LLFontRegistry can now directly consult LLDir for its path search. Stop passing LLUI::getXUIPaths() to LLFontGL::initClass() in LLViewerWindow's constructor and initFonts() method. Add LLDir::append() and add() methods for the simple task of combining two path components separated by getDirDelimiter() -- but only if they're both non-empty. Amazing how often that logic is replicated. Replace some existing concatenations with add() or append(). New LLDir::findSkinnedFilenames() method must know current language. Allow injecting current language by adding an LLDir::setSkinFolder(language) param, and pass it where LLAppViewer::init() and initConfiguration() currently call setSkinFolder(). Also add LLDir::getSkinFolder() and getLanguage() methods. Change LLFLoaterUIPreview's LLLocalizationResetForcer helper to "forcibly reset language" using LLDir::setSkinFolder() instead of LLUI::setupPaths(). Update LLDir stubs in lldir_stub.cpp and llupdaterservice_test.cpp. Add LLDir::getUserDefaultSkinDir() to obtain often-overlooked possible skin directory -- like getUserSkinDir() but with "default" in place of the current skin name as the last path component. (However, we hope findSkinnedFilenames() obviates most explicit use of such individual skin directory pathnames.) Add LLDir unit tests for new findSkinnedFilenames() and add() methods -- the latter exercises append() as well. Tweak indra/integration_tests/llui_libtest/llui_libtest.cpp for all the above. Notably, comment out its export_test_floaters() function, since the essential LLFloater::buildFromFile(optional LLXMLNodePtr) functionality has been removed. This may mean that llui_libtest.cpp has little remaining value, not sure.
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-09-04Cleanup actions from code review of llappearance with nyxDon Kjer
2012-09-04Set virtual inheritance on LLTexture -> LLRefCountDon Kjer
2012-09-04Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTextureDon Kjer
2012-09-04Split LLTexLayerSetBuffer into llappearance portion, and viewer-specific ↵Don Kjer
LLViewerTexLayerSetBuffer
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 18:52:59 +0000