Commit Graph

58 Commits (1bc3d1a18670db355d3b09c2e062ec06d1c5d9ed)

Author SHA1 Message Date
Graham Linden 723f1891db Merge 6.3.1 viewer-release 2019-08-26 12:35:18 -07:00
Graham Linden 41ede77744 SL-10625 2019-07-24 12:52:24 -07:00
Graham Linden 1529c16201 SL-11610
Revert attempted fix for 10625.
2019-07-24 10:53:04 -07:00
Graham Linden dc7aa170b8 SL-11610
Give bake its own RT to avoid issues with sharing the water distortion map.

Use glFinish to insure RTs will be complete.
2019-07-16 14:12:37 -07:00
Graham Linden 946da4e507 SL-10761
Add work-around for broken intel drivers which can't use glReadPixels from RGBA FBOs to get alpha without locking up.
2019-07-15 15:04:48 -07:00
Graham Linden 1d86dcd846 SL-10625 another shot across the bow
Move dynamic texture update (which does local back readback work) to just before swap
which may keep the Intel driver from tripping on its own shoelaces and is also subjectively faster for bakes.
2019-07-08 10:10:22 -07:00
Anchor Linden bfbcd6d169 [MAINT-8081] - bakes on mesh. 1st pass. changed texture panel to select bakes on objects. handle magic bake ids in LLViewerObject. 2018-02-28 22:14:38 -08:00
Anchor a416dee2cc cleanup the commented out code 2017-09-13 21:27:26 -07:00
Anchor 8c7edbef18 1024*1024 baking viewer updates 2017-09-06 03:24:58 -07:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
Don Kjer 1f6e20c5bb Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture 2012-09-04 17:43:08 +00:00
Brad Payne (Vir Linden) 5ee461ab19 merge 2012-08-08 15:52:54 -07:00
Brad Payne (Vir Linden) 1f234f8593 merge 2012-06-27 11:33:19 -04:00
Dave Parks fd578f1136 MAINT-654 Potential fix for corrupt avatar bakes on some AMD systems. 2012-06-26 15:44:02 -05:00
Brad Payne (Vir Linden) 99c1c64aa4 SH-3172 WIP - fix 2012-06-26 16:05:03 -04:00
Dave Parks 08a621f050 MAINT-1092 Fix for broken avatar bakes on some AMD graphics cards. 2012-05-17 18:34:14 -05:00
Dave Parks 8c15a7e17f SH-2902 Fix for avatar bakes etc. getting garbage data sometimes. 2012-02-07 14:51:30 -06:00
Dave Parks 9ea41c8094 SH-2243 No deprecated calls for the whole session. 2011-09-20 00:54:37 -05:00
Dave Parks c0ca2c62fd merge 2011-09-13 16:11:22 -05:00
Dave Parks c8b8b153f1 SH-2242 Don't make LLDynamicTexture targets use shaders all the time (revisit later). 2011-08-27 00:48:14 -05:00
Dave Parks db92b03691 SH-2242 Start using "no fixed function" when rendering dynamic textures. 2011-08-10 14:49:11 -05:00
Dave Parks 14f6bbadef SH-2242 Work in progress migrating to glVertexAttrib everywhere 2011-08-08 15:29:23 -05:00
Xiaohong Bao 01cdeb0cdd Merge from viewer-development 2011-02-23 10:44:59 -07:00
Xiaohong Bao ba1266043f trivial: for VWR-22353: remove debug code for EXT-6791. 2011-01-07 15:04:36 -07:00
Xiaohong Bao f4ff1430f0 first iteration of memory pool code 2010-12-03 22:16:16 -07:00
Xiaohong Bao 2969599880 a try to fix EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D 2010-08-30 18:06:45 -06:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Xiaohong Bao b064285da3 fix for EXT-8730: crash at llrender/llimagegl.cpp(157) : error ERROR: checkTexSize: wrong texture size and discard level: width: 512 Height: 512 Current Level: 2010-08-23 16:16:41 -06:00
Xiaohong Bao 17553add7c added a toggle "LLGLManager::mDebugGPU" for debugging certain CPUs.
added more debug code for EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-08-23 11:32:58 -06:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Xiaohong Bao 731086241b EXT-8457: FIXED: crash at [1] LLImageGL::checkTexSize(bool) [secondlife-bin llimagegl.cpp] 2010-07-22 11:28:16 -06:00
Xiaohong Bao 0dee7a3ece debug code for EXT-6791: Intel 965 Crash in glCopyTexSubImage2D. 2010-04-09 22:02:32 -06:00
James Cook 7d3b3cc474 Linker optimization - use "extern template" for commonly regenerated templates
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer.
Reviewed with Ambroff
2009-11-30 14:41:52 -08:00
James Cook 0f6242d9fd Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect (scaled vs. raw)
Reduces chance of future UI bugs related to UI size.
Discussed with Richard.
2009-11-10 14:00:38 -08:00
Xiaohong Bao 35e200881c merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 2009-11-06 06:52:24 +00:00
Xiaohong Bao 77f56a3f3d merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
Steven Bennetts 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
Brad Kittenbrink 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
Mark Palange 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
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 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 d725e5b240 QAR-872 Viewer 1.21 RC 3
merge viewer_1-21 96116-97380 -> release
2008-09-29 19:14:50 +00:00
Steven Bennetts 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
Steven Bennetts 63e7894148 QAR-570 maint-render-4 merge
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-05-08 18:41:20 +00:00
Steven Bennetts 16baf6c9d4 merge release-QAR-499 Viewer 1.20 RC 3
merge release-QAR-508 Viewer 1.20 RC 4
merge Branch_1-20-Viewer -r 85278 : 85828 -> release
2008-04-28 23:29:46 +00:00
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release
QAR-424
2008-04-01 17:45:04 +00:00