6b3a7480a1
merge
2011-07-26 15:47:53 -07:00
fd9f3b9fe9
EXP-1021 FIX Position of web content browser dictates position of profile panel - profile panel position changes do not persist
...
EXP-1030 FIX Search button toggle can get out of synch in bottom bar
made llinstancetracker::iterator do own nested level management (removing need for separate guard)
added support for filename= to floaters
can pass in arbitrary window_class to floaters
2011-07-26 14:26:27 -07:00
6469f1c2f2
SH-2031 High risk changeset, but potentially high reward. Addresses frame stalls in renderer by never using the fixed function pipeline if shaders are available.
2011-07-17 00:24:08 -05:00
268f3dbdea
SH-2038 Fix for some compiler errors from the apple tweaks -- also add a fence API (disabled for now).
2011-07-10 02:29:39 -05:00
e4d0d62e71
Added support for apple flush buffer range
2011-07-09 22:30:30 -07:00
2ac1fe03e8
SH-1838 Fix for black screen when enabling lighting and shadows on an ATI machine.
2011-06-21 16:11:04 -05:00
6992dbc1e3
SH-1682 Use GL_ARB_map_buffer_range to mitigate impact of mapping larger vertex buffer objects. Limit number of textures per batch to 6 (prevents frame stalls on NVIDIA).
2011-06-01 23:46:04 -05:00
ece32418e7
SH-1682 Dynamically adjust the number of texture channels to use for indexed texture rendering based on available hardware.
2011-05-31 14:35:59 -05:00
3a2c3a45aa
Remove unused variable.
2011-05-25 19:23:41 -05:00
9eea451a82
SH-469 Don't use depth buffers and multisample buffers where not absolutely needed -- make sample counts consistent between shaders and render targets.
2011-05-25 15:51:15 -05:00
fd574e3485
merge
2011-05-19 20:42:56 -05:00
51bb3c15c8
SH-469 WIP -- get rid of LLMultiSampleBuffer and use GL_ARB_texture_multisample instead.
2011-05-19 20:38:39 -05:00
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
93696ac019
merge
2011-05-12 17:39:08 -05:00
d4b9db012e
FIX VWR-25609: crash on shutdown in LLGLNamePool::sInstances destructor
2011-04-26 15:04:22 -07:00
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
897a4668bd
SH-1320 Fix for flickering objects in water distortion/reflection maps.
2011-04-08 01:24:17 -05:00
666f06eace
SH-874 Followup -- use GL_NVX_gpu_memory_info for NVIDIA chips to detect actual installed and available VRAM.
2011-03-10 11:46:16 -06:00
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
774405e92b
Cleanup of headless client (was: DisableRendering mode)
...
* Now called 'HeadlessClient' instead of 'DisableRendering'
* Removed most cases where we skipped certain behaviors in the client when in this mode. This gets us closer to a 'true' client, for testing purposes.
2011-02-18 23:16:38 +00:00
10518eaaae
SH-874 Revert much of the bad water bounding box and distortion texture usage changes from SNOW-643 and properly occlusion cull void water patches for machines without depth clamp.
2011-02-09 16:53:47 -06:00
9cd092544f
SH-545 [REGRESSION] Enabled Basic Shaders Can Cause an Unrecoverable System Lock Up
...
originally done in http://bitbucket.org/leyla/leyla-mesh-development
2011-02-08 15:00:42 -08:00
875d36b083
merge
2011-01-05 01:23:37 -06:00
1e647e2cd2
Faster occlusion queries (take advantage of GL_ARB_occlusion_query2 where available and don't read back result if it will block).
2010-12-31 18:41:54 -06:00
57153cf0f1
SH-655 - Project mesh viewer crashes on exit.
...
A copy constructor was implemented which did a memcpy,
which included the vtable pointer which was to another object of another
class (same child though). This resulted in the wrong destructor
being called.
The reason for the memcpy was for alignment purposes.
The solution was to move to LLVector4a, which is intrinsicly aligned.
Also, did some performance optimizations based on the LLVector4a optimizations.
The solution was to re-implement the
2010-12-23 01:48:44 -08:00
48b107ac97
Apparently the new standard is to NOT suffix ARB extension function pointers with ARB.
2010-12-03 02:37:14 -06:00
0be7fcf2a9
SH-373 Update glext.h, disable anti-aliasing on ATI when rendering deferred. Get rid of RenderUseFBO debug setting (only use FBO when rendering deferred). Use GL_ARB_framebuffer_objects instead of GL_EXT_...
2010-12-02 21:33:03 -06:00
639bb11eef
Automated merge from viewer-development-shining
2010-10-27 16:19:18 -04:00
4809142acc
add a debug function to output gl error information to the log file without crashing the viewer.
...
No need to test because there are no negative effects.
2010-10-12 15:35:39 -06:00
c7b6ebaf76
Port of SNOW-643 : Water flicker at high altitude. This doesn't fix the low altitude flicker though (STORM-306)
2010-09-30 22:57:05 -07:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
ce1a0c6baf
Final(???) merge from viewer-release to viewer-public.
2010-08-24 14:52:05 +01:00
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
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
d72a21aca1
further UI rendering performance improvements
2010-07-30 15:17:32 -07:00
bf8b1bca7d
Let GL errors be caught on Linux - don't know why this was disabled.
...
(transplanted from a149524a63039870704a498952d9bb3aa599b472)
2010-04-22 16:28:33 +01:00
873ed0febf
Make assert_glerror not a hotspot.
...
(transplanted from 8476304a30a3c387a722b33743ef3385e85f85a0)
2010-04-20 11:38:07 -05:00
1cb8dd7253
Remove a '#error XXX' I was using to test ifdef-hell.
2010-03-08 15:48:27 +00:00
0604715af6
Add support for glBlendFuncSeparate().
...
I want it to fix glow-through-alpha, but this checkin doesn't includes any of those changes.
2010-03-07 18:31:32 +00:00
8b9492a685
CID-293 Defect
...
Checker: UNINIT_CTOR
Function: LLGLManager::LLGLManager()
File: /indra/llrender/llgl.cpp
--HG--
branch : product-engine
2010-02-03 18:18:13 +00:00
2a00a16f57
EXT-3784 Fix for first menu item going blank when highlighted on ATI cards.
2010-01-11 11:21:52 -06:00
eca30a2262
QAR-1619: merge up to 2009-09-26 viewer/viewer-20
2009-09-30 21:42:04 -04:00
658849ee95
Getting rid of "gl used while not active" test until such time as it is needed/useful (when threading is revisited).
2009-09-23 08:02:49 +00:00
536e38ad51
Merging render-pipeline-6-qa-2 into viewer-2
...
Self reviewed.
2009-09-22 11:11:45 +00:00
baa73fddd9
Merge with viewer-2.0.0-3 branch
2009-06-22 15:02:19 -07:00
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
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
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
Richard Nelson