a158c87957
Hide sRGB decode behind a flag, and make sure that sRGB decodes is strictly opt-in.
2019-03-30 17:22:54 -07:00
2513aa0ed1
Additional gamma correction work: start moving over to EXT_texture_sRGB_decode.
2019-03-30 03:18:02 -07:00
0272c47e5a
Tweaked naming a bit, also white space.
...
Will wait for a response from @graham_linden regarding moving the sRGB conversion functions in llmath.h to llrender.
2019-03-29 11:57:45 -07:00
57d88a8a98
Gamma correction pass 2:
...
Make sure lights are in the correct color space.
Bonus: cache the sRGB color in setLightColor on point and spot lights. Frees up a pow and some multiplies on the CPU every frame.
2019-03-29 08:11:56 -07:00
446afe2d1a
Make whether the sun or moon is primary part of llrender light state so we can set uniforms for shaders along with other light params.
...
Fix atten calcs to not use abs val.
2019-03-26 08:21:53 -07:00
7fdc689a85
Merge viewer-eep
2019-03-21 20:54:50 +01:00
772924252b
Merge viewer-eep
2019-02-28 23:38:39 +01:00
788a108384
SL-10501
...
Fix broken matrix management code causing modelview mats to be used as tex anim mats
(do not depend on default matrix mode already being set).
Give the deferred terrain shader a name.
Make LLRender use the eMatrixMode enum instead of ints.
2019-02-21 16:03:46 -08:00
f8ad1551b3
Merge viewer-eep
2019-02-10 13:12:23 +01:00
0a7bc35335
Replace funcs dropped in merge.
2019-02-08 13:19:45 -08:00
90f9078d1f
SL-10486, SL-10501, SL-10487
...
Make moon texture from default daycycle the default moon texture id and use it for the default and blank assets in the picker.
Fix handling of MM_TEXTURE to correctly detect when texture units outside the range 0-3
are used with texture matrix ops to prevent mem overwrite bug and/or asserts.
2019-02-07 16:00:21 -08:00
9a007cceef
SL-10461
...
Pass projector ambiance as the .w element of the light_attenuation uniform
so that alpha shader can emulate the behavior of proper spot projectors.
2019-02-04 12:56:11 -08:00
a10ec81e82
SL-10743, SL-10744
...
Don't step on SUNLIGHT_COLOR uniform w/ syncLightState competing set.
Put drawpool alpha render loop lighting setup changes as they were
(this will give back some performance and possibly require reopening 10566).
2019-03-15 08:13:04 -07:00
c699f816d1
Merge viewer-eep
2018-11-16 00:22:32 +01:00
536799d07e
SL-9977
...
SL-9973
2018-10-29 23:02:20 +01:00
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
451ab80ca6
Fix tex format mismatch between what libatmosphere was generating and what we were claiming to use in rendering.
...
First pass at sky shader using libatmosphere sky radiance lookup.
Add atmo density controls to ext daycycle floater tabs.
2018-09-06 22:50:26 +01:00
d5c465b4ab
MAINT-8817 remove automatic update of inv_proj matrix so sunLightF which expects it not to match the projection mat works again
...
Fix misspellinging in missing settings asset notification string
Fix moon quat conversion to get proper directional rotation
Add early out so attempting to set parcel env settings doesn't crash
2018-06-29 20:15:10 +01:00
610a793aa8
EOL in llsetingssky.cpp and llrender.cpp. const on ptr_t & in llenvironment
2018-06-05 11:19:22 -07:00
8cfdc07e79
Code cleanup and move to using typedefs of S64Seconds/F64Seconds for ease in sync w/ sim side which has not llunits types.
2018-06-01 23:32:30 +01:00
3116416fcb
Le Merge
2018-05-01 00:10:11 +01:00
c4e18fbcaa
Merge viewer-neko
2018-02-27 18:08:48 +01:00
99b82d9449
Atmospherics WIP
...
libatmosphere integrated in indra/llrender/llatmosphere.cpp
Still working on runtime shaders to use libatmosphere precomputed atmospherics textures
2018-02-18 15:52:23 +00:00
06bce2ddd0
Add debug setting and code to allow nVidia nSight graphics debugging to capture SL frames.
...
These changes are only enabled if RenderNsightDebugSupport is true and eliminate use of
some OpenGL legacy functionality which is incompatible with nSight capture
(mostly glReadPixels and other fixed-function pipe rendering calls).
2018-02-15 21:55:24 +00:00
e7715f7a31
Merge Firestorm LGPL
2017-11-30 20:33:07 +01:00
66a7a9b7a6
Make some use of new vertex buffer checks
2017-11-12 13:57:52 +01:00
9d0d42c22b
Merge with FS tip.
2017-05-10 21:25:21 +02:00
1c543fc781
Replace GL_TEXTURE_RECTANGLE_ARB with GL_TEXTURE_RECTANGLE
2017-04-27 10:07:20 +02:00
13e89be3a5
Reset all VertexBuffer during TP
2017-04-26 16:04:06 +02:00
b556384baf
Merge with viewer64.
2017-04-10 15:20:58 +02:00
7c5e92cec5
SL-644 Add guard to mCount in LLRender.cpp
2017-03-13 11:13:43 -07:00
0c4c1b5968
Remove deprecated OpenGL QUADS rendering mode
2017-03-04 23:57:37 +01:00
6d3df79ea9
Merge #3 with lgpl.
2017-02-06 12:07:45 +01:00
434f0e161a
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-02-03 09:54:52 -05:00
2290d5ed16
Merge with viewer64, first pass.
2017-01-10 19:33:15 +01:00
067468885a
BUG-41027 (FIX) Changing login location at the login screen crashes the viewer
2016-12-15 10:58:23 -08:00
c182741596
Merge viewer-lynx
2016-11-16 09:55:54 +01:00
3c9181867f
MAINT-6905 reducing log spam
2016-11-04 16:18:35 +02:00
c4e21cf282
Fix a crash is drawn vertices is 0.
...
(transplanted from 89b3e585218ddb8d6a3e62af29f8daf889371e5e)
2016-04-24 12:55:13 +02:00
eebbda288d
Backed out changeset: 5fe5ad059c05
2016-07-18 20:09:18 +03:00
05fcb7c812
Automated merge with tip of viewer-release
2016-05-23 16:50:56 -07:00
1b5af4be29
Add invert texture coordinates for media textures.
2016-05-13 18:47:23 +03:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
a45d3d8421
Merge Viewer-Bear
2015-06-20 15:35:15 +02:00
29bdf1a234
MAINT-4839 FIXED Animation of Mesh Dress doesn't work.
...
MAINT-4165 FIXED Crash on skinned, texture animated geometry with deferred rendering enabled.
2015-03-01 14:10:54 +02:00
799d13269a
MAINT-3585 FIXED Viewer Crashes when attempting to upload image.
...
The bug was fixed, the reasone of crash is following. The Core Flow view
contain another GL context and will not care about restoring a previous.
I restore context manually.
This path also contain a minor changes in another files.
All changes described here.
Сhange's for fix current bug.
indra/llwindow/llwindow.h
indra/llwindow/llwindowheadless.h
indra/llwindow/llwindowmacosx.h
indra/llwindow/llwindowsdl.h
indra/llwindow/llwindowwin32.h
indra/newview/lllocalbitmaps.cpp
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.h
Twice mUsage initialization (replace to forward initialization).
indra/llcharacter/lljointstate.h
Looks like condition should be befor memcopy call, otherwise - possible CRASH.
indra/llcommon/llmd5.cpp
Unused condition and variables.
indra/llmath/llsphere.cpp
Looks like should be under if otherwise - possible CRASH
indra\llprimitive\llmodel.cpp
Useless assert's.
indra/llrender/llrender.cpp
indra/newview/lldaycyclemanager.cpp
2014-11-03 20:05:20 +02:00
b008385a50
FIRE-12732/MAINT-3585 FIXED Viewer Crashes when attempting to upload image
...
on OS X.
The bug was fixed, the reasone of crash is following. The Core Flow view
contain another GL context and will not care about restoring a previous.
I restore context manually.
This path also contain a minor changes in another files.
All changes described here.
Change's for fix current bug.
indra/llwindow/llwindow.h
indra/llwindow/llwindowheadless.h
indra/llwindow/llwindowmacosx.h
indra/llwindow/llwindowsdl.h
indra/llwindow/llwindowwin32.h
indra/newview/lllocalbitmaps.cpp
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.h
Twice mUsage initialization (replace to forward initialization).
indra/llcharacter/lljointstate.h
Looks like condition should be befor memcopy call, otherwise - possible CRASH.
indra/llcommon/llmd5.cpp
Unused condition and variables.
indra/llmath/llsphere.cpp
Looks like should be under if otherwise - possible CRASH
indra\llprimitive\llmodel.cpp
Useless assert's.
indra/llrender/llrender.cpp
indra/newview/lldaycyclemanager.cpp
2014-11-03 20:05:20 +02:00
e52d57cba2
Merge LL V3.7.23
2015-01-15 15:44:43 +01:00
d47efdfe03
MAINT-3964 FIXED Textures with Alpha won't Animate on Rigged Mesh when worn : fix in shader (mul texcoord to tex matrix), array's optimization
2014-09-10 21:08:08 +03:00
6095a2072d
more deprecated call fixes (llmsg -> LL_MSG() / llendl -> LL_ENDL)
2014-06-10 08:01:16 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
8c91463476
FIRE-12968; Even though the root cause is likely the shader memory overrun, preseed the VBO pools to take some strain from the driver. Remove the LLStrider changes while at it, those are not used in the Havok version and have not triggered anything in the OS version since month.
2014-03-10 00:45:41 +01:00
021dba83af
MAINT-3359 Don't check for LLGLSLShader::sNoFixedFunction as we don't want to loose ui colours(depending on enabled/disabled basic shader).
2013-10-30 14:26:11 +02:00
962f90dbbb
Backed out changeset 577f38970ed9 - Fix coming up...
2014-02-07 07:59:41 +01:00
28b1297e50
Backed out changeset: 54055f06639f - causes FIRE-12858
...
-disabling Basic shaders now makes the UI practically unusable
2014-02-06 19:40:34 -08:00
dfa6822b34
MAINT-3359 Don't check for LLGLSLShader::sNoFixedFunction as we don't want to loose ui colours(depending on enabled/disabled basic shader).
2013-10-30 14:26:11 +02:00
7fdf010d6a
Fix for random bad colors in UI on Intel HD 4000
2013-10-08 14:43:10 -05:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
71e986b059
NORSPEC-285 fix merge error with attenuation on alpha masquerading as this norspec from wayback
2013-09-23 14:49:10 -07:00
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07:00
0ab4e11223
Fix for random bad colors in UI on Intel HD 4000
2013-10-08 14:43:10 -05:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
d6d2f74fbb
NORSPEC-290 Shader optimization WIP -- compatibility pass with OpenGL 3.3, slight cleanup.
2013-07-01 16:27:20 -05:00
7df863265f
NORSPEC-290 Shader optimization WIP -- remove a couple normalizes, pows, and divides from various lighting functions.
2013-06-28 13:32:01 -05:00
380785e613
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-27 16:16:56 -05:00
c603eb5ece
MAINT-318 prevent crashes from incomplete quads and lines and prevent drivers from crashing to desktop when passed short buffers
2013-06-17 08:03:32 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
c978364e1e
for SH-4133: create a debug tool to show textures in active fetching
2013-04-22 22:11:41 -06:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
586025bde5
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-03-04 18:06:29 -06:00
609ed855e1
MAINT-2371 More optimizations.
...
Reviewed by Graham
2013-03-04 18:01:42 -06:00
4e81a84abd
Performance improvements. Faster threadsaferefcount, faster instancetracker, use hashtable and pre-hashed strings for GLSL uniform lookup, and use dup_handles curl interface to avoid re-initing ares resolvers expensively.
2013-03-04 08:57:58 -08:00
f5e5396c3a
MAINT-2371 First set of profile guided optimizations.
...
Reviewed by Graham
2013-02-26 15:15:08 -06:00
2fd0e6e8f9
Merge viewer-cat and resolve conflict with alternate self
2013-02-21 16:50:04 -08:00
f67087b872
MAINT-2370 Add debug setting "RenderAutoMuteRenderCostLimit" that automatically visually mutes avatars above a certain threshold (adjusted by Avatar Mesh Detail Slider)
2013-02-20 19:30:46 -06:00
119ce81029
Merge viewer bear updates + merge fixes
2013-09-23 22:10:59 -07:00
0c314a0e6f
Merge LGPL
2013-09-21 16:59:50 -07:00
05ad3a1c29
Merge Viewer-bear (merge of materials + fixes) to FS-exp
2013-09-21 11:44:46 -07:00
5519c39beb
Merge Viewer-bear (Materials 3.6.6 RC)
2013-09-16 16:18:33 -07:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
af17cbce9f
Forgot the #ifdefs for the Havok enabled version, so setCount of llstrider is only called on non Havok builds.
2013-04-20 03:31:54 +02:00
6bfe9a8686
Protect VBOs against buffer overflows: Need to set striders to their correct size.
2013-03-26 23:00:35 +01:00
49caededb4
BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa
2012-09-19 17:05:56 +00:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
9f4245779c
Partial Merge of LL 3.4.2 Release
2012-12-10 15:56:46 -08:00
d1c056beba
MAINT-685 Fix for disabling basic shaders making high detail terrain render incorrectly.
2012-07-03 14:35:08 -05:00
bedbbf7c02
Merge
2012-06-28 16:32:54 -05:00
cb24ec2e0d
merge LL 3.3.4 beta
...
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
2012-07-16 21:59:14 -07:00
9e9d32de38
merge
2012-06-22 14:04:33 -05:00
e3a5125b41
MAINT-616 Potential fix for corrupted mip maps.
2012-05-25 17:58:12 -05:00
991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
cb2e785f61
FIRE-5577; Avoid matrix modes overflow. A bit hackerish, but still better than crashing.
2012-05-29 01:39:58 +02:00
9eee943f83
Commenting out spammy debug line.
2012-05-07 22:57:24 -07:00
7b3f721e7a
SH-3018 WIP - removed audit texture, other unused diagnostic code
2012-02-29 16:15:02 -05:00
1de63bec50
MAINT-861 Fix for crash on exit due to bad matrix mode
2012-04-13 15:47:44 -05:00
34408bed26
merge
2012-02-01 15:43:11 -05: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
9f7c9cffa3
Merge up to 26380 / 19ccfae26929 (V/dev tip).
2012-02-02 19:38:24 +01:00
050be7eddf
Merge up to 26341 / 767757e005e3 (V/dev tip).
2012-01-31 11:38:33 +01: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
c089ad69cc
Added extra checks for vertex buffer underruns which caused memory corruptions and crashes with text rendering in e.g. scroll lists. Should fix FIRE-2216
2011-07-19 15:59:35 +02:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
85053e53b6
fix for VWR-22811: crash at LLImageGL::createGLTexture(int,unsigned char const *,int,int) [secondlife-bin llimagegl.cpp] line 1259
2010-09-10 10:26:42 -06:00
ad9330025d
fixed crash on entering build mode
...
(transplanted from 72651623d96deee014411daeb82d50452261e0b3)
2010-08-06 11:03:28 -07:00
a5c80966e7
Backed out changeset 7a739cbdce56
...
A proper fix from Richard is coming next.
2010-08-27 13:47:47 +01:00
1a8d917a6d
lame-but-effective workaround for self-editing UI bug, until the right fix is ready.
2010-08-26 13:09:55 +01: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
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
e41525cac4
Fix for crash when rendering translation handles.
2010-08-26 17:06:34 -05:00
50d8cc6d37
first pass ui rendering performance improvements
2010-07-23 22:07:15 -07:00
6cc6f81678
first pass ui rendering performance improvements
2010-07-23 22:07:15 -07:00
d2996b6859
EXT-6276 Fix for UI going all wonky.
2010-03-12 13:17:30 -06:00
58afe469f9
Bizarrely hacky fix for EXT-6276 (#if LL_DARWIN out copyFromPrimarySubstring)
...
General gl state cleanup in llui.
Make llrender more gGL.begin/end friendly.
2010-03-12 13:01:50 -06:00
f5c431aa7b
EXT-6276 Put in some gl flush calls to texture state functions.
2010-03-11 16:06:36 -06:00
9aefe34998
EXT-6276 Put in some gl flush calls to register combiner functions (why these are being used for UI now is beyond me)
2010-03-11 15:19:27 -06:00
b214180ac1
a better fix for the blend-factor init problem. I think.
2010-02-13 13:55:41 +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
b307d020a8
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
b8739946be
Fix for blend func being screwed up at init.
...
Fix for avatar appearance editor drawing hair in the background.
2010-02-08 19:15:43 -06:00
4538bdd8e9
Fix for bad GL blend function caching.
2010-02-06 20:50:49 -06:00
54a95f706f
merge
2010-02-23 17:19:58 -08:00
7885748497
Turning back on Davep's ui optimizations. Backed out changeset 6c161782dba3
2010-02-23 17:08:06 -08:00
660c3b182c
merge
2010-02-12 21:05:09 -08:00
651b14fcae
Backed out davep's UI optimization. changeset 3134cb7bb181
2010-02-12 21:04:51 -08:00
ff0271d632
merge
2010-02-04 23:43:13 -06:00
979ddb2ec9
No more matrix ops in UI code.
2010-02-04 23:41:54 -06:00
36be134aee
CID-292
...
Checker: UNINIT_CTOR
Function: LLRender::LLRender()
File: /indra/llrender/llrender.cpp
2010-02-03 18:38:52 +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
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
536e38ad51
Merging render-pipeline-6-qa-2 into viewer-2
...
Self reviewed.
2009-09-22 11:11:45 +00:00
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00: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
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
6db6d81b0a
Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).
...
No conflicts in the merge.
Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
2009-03-05 00:29:27 +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
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
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
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
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
da94c0eaa2
QAR-855 Viewer 1.21 RC 2
...
merge viewer_1-21 94770-96059 -> release
2008-09-12 06:27:13 +00:00
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
939a506569
Merging in file-move-merge ( QAR-649 )
...
Result of "svn merge -r 90669:90786 $tulla/file-move-merge ."
Be careful of future merges involving changes to any of these moved files as SVN usually does the wrong thing:
newview/llglslshader.* -> llrender/llglslshader.*, llrender/llshadermgr.*, newview/llviewershadermgr.* (gets split into 3 separate files)
newview/llpostprocess.* -> llrender/llpostprocess.*
newview/llrendersphere.* -> llrender/llrendersphere.*
newview/llcubemap.* -> llrender/llcubemap.*
llwindow/llgl.* -> llrender/llgl.*
llwindow/llglstates.h -> llrender/llglstates.h
llwindow/llgltypes.h -> llrender/llgltypes.h
llwindow/llglheaders.h -> llrender/llglheaders.h
2008-06-30 17:57:00 +00:00
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
Geenz