Commit Graph

69 Commits (bfe520387ed3061ba55ea2e58c565016e7a3159e)

Author SHA1 Message Date
Graham Linden 0103cac1dd Merge viewer-bear maint RC changes to get this build closer to the RC it will follow 2013-09-26 11:44:40 -07:00
maksymsproductengine bd0a8c7ee9 MAINT-3128 FIXED Advanced graphical settings are not changing when dragging "Quality and Speed" slider 2013-09-11 00:41:10 +03:00
Oz Linden 980802e468 STORM-1552: detect, ignore, and delete invalid feature and gpu table files 2013-09-05 22:06:16 -04:00
Nat Goodspeed c08b60ac6f CHOP-959: Streamline processing for --graphicslevel switch.
Use map-to in cmd_line.xml to inform the command-line processor that the
target variable for --graphicslevel is RenderQualityPerformance.
That lets us eliminate clunky llappviewer.cpp switch from '0' to 0, etc.
Moreover, previous switch statement only accepted 0 - 3, whereas
LLFeatureManager::setGraphicsLevel() actually accepts 0 - 6. Introduce
LLFeatureManager::isValidGraphicsLevel() and use that to validate.
Replace switch statement in setGraphicsLevel() mapping int constants to string
literals with static vector of level names, using same data for mapping as for
validating level numbers.
2013-06-28 15:26:18 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Graham Madarasz 3c5ac77a92 For MAINT-2157 Codereview: DaveP 2013-02-07 09:02:51 -08:00
Dave Parks 954ebaed84 Automated merge with https://bitbucket.org/lindenlab/viewer-tiger 2013-01-08 13:40:59 -06:00
simon@Simon-PC.lindenlab.com 716e2ea3b1 Pull and merge viewer-development 2012-12-12 10:58:47 -08:00
Nat Goodspeed e1da5bda78 merge changes for DRTVWR-257 2012-12-05 18:18:16 -05:00
Dave Parks 1f2b88803e MAINT-1953 Run through viewer stats and update GPU table with missing entries and new expected OpenGL versions 2012-12-04 16:10:15 -06:00
Dave Parks e83700b56d MAINT-1991 Attempt to mitigate crashes in GL drivers by encouraging people to update their drivers.
Reviewed by Simon
2012-11-30 17:03:12 -06:00
Dave Parks 73d1b4f79c MAINT-1950 Add hashmarks to detail slider and put "Ultra" back in setGraphicsLevel
Reviewed by Simon
2012-11-26 13:22:25 -06:00
Dave Parks 4aa818055e MAINT-1950 Add hashmarks to detail slider and put "Ultra" back in setGraphicsLevel
Reviewed by Simon
2012-11-26 13:22:25 -06:00
Dave Parks ccef9ab267 MAINT-2086 Separate GPU class from settings more completely to avoid GPU dependent behavior when manually adjusting detail slider. 2012-12-12 16:42:06 -06:00
Dave Parks fd3cbbaa27 MAINT-2090 Make gcc happy 2012-12-12 15:23:50 -06:00
Dave Parks e0bc069af2 MAINT-2090 Never enable lighting and shadows by default on OS X 2012-12-12 14:52:36 -06:00
Nat Goodspeed b6f0921099 Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased 2012-09-06 19:02:39 -04:00
Dave Parks 9611356556 MAINT-1491 Integration of statistically generated GPU table -- enable shadows by default where appropriate. 2012-08-28 13:52:14 -05:00
Dave Parks f5254d532b MAINT-1262 Fix for crash when setting graphics to Low 2012-07-12 16:53:31 -05:00
Dave Parks 513c1d9744 SH-795 Potential fix for crash after setting graphics detail to low. 2012-03-20 16:05:29 -05:00
Dave Parks 83e69659e2 MAINT-708 Add checkbox to hardware settings for controlling texture compression. Default texture compression to on for cards with 512MB of VRAM or less, off otherwise. 2012-03-08 15:22:56 -06:00
Dave Parks f5b10238af SH-2240 Forcibly disable shaders on hardware that's specifically flagged as unsupported. 2011-10-24 13:10:26 -05:00
Dave Parks 1762cc4939 SH-2570 Don't minimize viewer when reloading shaders (revert hack that didn't work) and pause shader loading until after all feature masks have been applied when switching detail levels 2011-10-20 14:20:12 -05:00
Richard Linden 25f1653ca0 EXP-1080 FIX Console gets spammed with VertexShaderEnable messages making the viewer unusable
converted LL_WARNS to LL_WARNS_ONCE
2011-08-11 14:21:20 -07:00
Dave Parks f1443579b3 SH-2038 Potential fix for a myriad of performance problems concering VBO usage. 2011-07-09 02:28:34 -05:00
Loren Shih 303a59e7bc dos2unix fixes for newview files. 2011-05-26 14:16:56 -04:00
Loren Shih 781addcbc1 Automated merge up from viewer-development into mesh-development 2011-05-20 11:41:28 -04:00
Leslie Linden 19a06478d9 SH-1618 FIX -- Lighting and shadows crash ATI macs
* Fixed ATI mac "lighting and shadows" related crash
* Fixed up numerous GL errors on macs related to multiple color formats,
  the use of glEnable/glDisable on textures above the texture unit count
  and old ATI-specific code that was not appropriate for Mac.
* Disabled SSAO for ATI macs due to it not working with shadows
* Ongoing work to properly get shadows and SSAO functioning on ATI macs is required.

Reviewed by davep
2011-05-19 17:28:23 -07:00
Oz Linden 5eb6cb8d86 merge up latest viewer-development (post mesh) 2011-05-18 07:33:08 -04:00
Oz Linden 27fd0d1a93 storm-1100: merged many more updates and refinements to table, added tester and files to test with 2011-05-13 13:27:56 -04:00
Leslie Linden 4268700fcf SH-1521 update -- Lighting and Shadows grayed out on mac
* Disabled SSAO on macs with 8 or less texture units.
* Slight cleanup of sunlight fragment shaders to remove unused texture units.

Reviewed by davep
2011-05-12 13:30:47 -07:00
Oz Linden 2eb19ccc13 STORM-1100 (diagnosis) improve logging to aid in debugging recognition errors 2011-04-15 20:46:31 -04:00
Dave Parks 5fd953df8f SH-874 Properly detect available video memory on ATI cards and disable vertex buffer objects when available vram is under 256MB. 2011-03-10 00:41:46 -06:00
Dave Parks 8f9edd3874 SH-534 Don't allow deferred rendering to be enabled on windows PC's with GL version less than 3.0. 2011-02-08 17:19:54 -06:00
Aleric Inglewood 9b341ec012 VWR-24317: remove warning caused by reading the last line of the featuretable twice 2011-01-20 15:03:48 -05:00
Dave Parks 35ad7ace90 Add featuretable_xp, set default VolumeLODFactor to 0.5 for class 0 hardware, and disable impostors on Intel 965 on xp. 2010-09-01 17:55:56 -05:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Karl Stiefvater (qarl) d0a8ae4557 EXT-7910 allow GPU and feature table to load from a custom location 2010-06-18 12:33:17 -05:00
Karl Stiefvater (qarl) e3753ed8b2 S3 feature/gpu table implementation. reviewed by palmer and davep. 2010-05-21 16:11:21 -05:00
Tofu Linden 7462911bdd Change Linux fasttimer implementation back to RDTSC - using a reliable syscall was REALLY chewing CPU time. Sigh. I didn't realize how incredibly often this gets called. So, back to the assembly.
But be more careful with CPU clock count on linux, so the fasttimer values are much more accurate than they were the last time we were with RDTSC, in absolute terms - back in the right order of magnitude anyway.

Also change many instances of Mhz to MHz.
Also some minor comment fixes.
2010-04-19 12:49:15 +01:00
Tofu Linden 63e421d3b3 CID-64
Checker: FORWARD_NULL
Function: LLFeatureManager::loadFeatureTables()
File: /indra/newview/llfeaturemanager.cpp

not a bug.
2010-02-11 14:15:41 +00:00
brad kittenbrink a7efd0d8dd Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so I'll need to rebuild that, plus a couple other minor clenaups. 2009-07-30 19:39:08 -07:00
Xiaohong Bao 77f56a3f3d merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
James Cook d6101558a1 Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-07-06 21:58:04 +00:00
Brad Kittenbrink 01d390825a DEV-27646 dll linkage for login module.
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-05-22 23:27:16 +00:00
Aaron Brashears 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
Mark Palange 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
Mark Palange 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
Steven Bennetts 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
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00