9f7c9cffa3
Merge up to 26380 / 19ccfae26929 (V/dev tip).
2012-02-02 19:38:24 +01:00
34408bed26
merge
2012-02-01 15:43:11 -05:00
050be7eddf
Merge up to 26341 / 767757e005e3 (V/dev tip).
2012-01-31 11:38:33 +01:00
e02f007d20
SH-1427 Fix for spot lights not working properly on alpha objects, and fix for alpha lighting of point lights not matching deferred lights.
2012-01-24 12:59:18 -06:00
05cff1ad7f
fix for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection()
2012-01-18 15:26:30 -07:00
837e38d819
trivial: debug code for SH-2827: [crashhunters] Crash in LLPipeline::generateWaterReflection()
2012-01-05 21:26:35 -07:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
45d3e147ac
SH-1912 Add environment map back into shiny when lighting and shadows enabled.
2011-11-29 17:13:11 -06:00
b2824aa21d
SH-2690 Add comments per Vir's review feedback
2011-11-16 15:25:09 -06:00
986dccbeaf
SH-2690 Fix for spammy triangle death on GeForce 7800 Go when selecting flexi attachments.
2011-11-16 15:08:17 -06:00
969aa248a4
SH-2633 Fix for avatar hair turning white when editing appearance
2011-10-28 16:26:20 -05:00
3211c6e308
SH-2240 WIP on removing lots of string comparisons that were added to deal with exploding amounts of non-built-in GL state
2011-10-11 00:26:03 -05:00
055a881084
SH-2031 fix for mac/linux build
2011-10-07 12:48:26 -05:00
79912f9d3f
SH-2031 Profile guided optimization of matrix ops
...
- don't use F64 except where needed (should really factor out calls to gluProject)
- get rid of sorting by texture in favor of sorting by matrix (no sort needed, geometry is already matrix sorted as a result of frustum cull tree traversal order)
- unroll matrix sync inner loop and cache MVP and normal matrices
2011-10-07 03:12:11 -05:00
40fe25632c
SH-2553 Fix for glitches when rendering HUD attachments.
2011-10-06 15:00:14 -05:00
7238714634
SH-2507 Potential fix for basic shaders causing objects to disappear with some drivers (prune shader tree of unused shaders while we're at it)
2011-09-29 19:32:56 -05:00
56191701bc
SH-2244 Fix for crash when enabling core profile on AMD GPUs
2011-09-25 02:43:43 -05:00
f674418251
SH-2244 Fix for UI blanking out on shader reload (stale matrix hash cleanup)
2011-09-25 00:20:12 -05:00
102f600d3a
SH-2244 Fix for bump surfaces appearing black when L&S disabled
2011-09-24 22:56:33 -05:00
b9926e8f57
SH-2244 Better VAO support -- still slower than non-VAO implementation for some reason
2011-09-23 02:29:53 -05:00
a2d08a6d80
SH-2244 Fix "RenderGLCoreProfile" actually make a core profile context and modify viewer to run under said context without generating errors.
2011-09-22 00:10:57 -05:00
66acb932ba
SH-2244 Add "RenderGLCoreProfile" debug setting that allows the viewer to start with a non-compatibility-profile OpenGL context.
2011-09-20 03:34:09 -05:00
4f99ace069
SH-2243 work in progress -- put back ambient lighting when atmospheric shaders disabled.
2011-09-17 00:19:19 -05:00
4fea7dcb3e
SH-2243 work in progress -- use a hash check to avoid redundantly setting light state
2011-09-15 17:10:33 -05:00
24ae2fb5af
SH-2243 work in progress -- don't use built-in GL light state when shaders are available.
2011-09-15 16:38:31 -05:00
530981a214
SH-2243 work in progress -- no more deprecated built-in matrix state when using shaders.
2011-09-15 00:54:25 -05:00
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
c0ca2c62fd
merge
2011-09-13 16:11:22 -05:00
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
7821ff23ba
SH-2242 Physics shape display works again, added asserts to flush out areas where state being consumed by a shader does not match state being provided by vertex buffers.
2011-08-27 00:38:53 -05:00
ee4fdd2c18
SH-2242 Work in progress on FXAA/glVertexAttrib -- DoF works, physics shape display still doesn't.
2011-08-21 16:23:04 -05:00
14f6bbadef
SH-2242 Work in progress migrating to glVertexAttrib everywhere
2011-08-08 15:29:23 -05:00
8ec39da346
SH-2181 Fix for alpha flickering when basic shaders enabled (don't use glAlphaFunc when shaders are available).
...
Reviewed by Leslie
2011-07-29 17:46:16 -05: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
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
36a05ebd9a
SH-1951 Partial fix for basic shaders disabled changing terrain appearance.
2011-07-05 17:25:57 -05:00
70f959f01e
SH-1738 Fix for broken UI text when deferred rendering enabled.
2011-06-06 02:41:09 -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
1fd46831f0
SH-1682 Work in progress on using texture indexes to improve batch size (wow, super fast so far)
2011-05-29 00:40:57 -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
ae65347e33
fix an exit crash.
2011-02-23 20:11:01 -07:00
844bf22d25
apply private pool to VBO
2011-02-23 19:48:08 -07:00
9e0ee4dff0
SH-1006 Quick pass at cutting down the number of redundant GL calls based on data from gDEBugger.
...
Reviewed by Nyx.
2011-02-17 17:18:57 -06:00
a5e63b1dc0
Merge
2010-11-08 12:57:26 -05:00
7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
b7cc611d60
SH-2181 Fix for alpha flickering when basic shaders enabled (don't use glAlphaFunc when shaders are available).
2011-08-28 08:50:32 -04:00
9fd0edb326
Initial 2.8.3+ merge, Tozh & Arrehn
...
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
Nicky