Commit Graph

990 Commits

Author SHA1 Message Date
Shyotl
ac12349a8a Merge branch 'V2Renderer' into V2TextureSystem
Conflicts:
	indra/newview/llviewercontrol.cpp
2011-04-23 19:33:20 -05:00
Shyotl
f7a5394904 Super-sampling only to be done when taking a snapshot to disk in high-res mode. Clamping to 3x.
Removed 'SHHighResSnapshotForceTile' setting, as tiling is now the only way snapshots can be done.
2011-04-23 17:51:29 -05:00
Shyotl
41f42fc741 Nuking some glsl warnings, and fixing relwithdebug compile(and prolly gcc too) 2011-04-23 03:02:56 -05:00
Shyotl
c694d12c93 Bringing in-line with V2. mbstowcs->MultiByteToWideChar, ancient comment removal, fullscreen behavior check... 2011-04-23 01:01:55 -05:00
Shyotl
f190644464 LLDrawPoolWater::shade no longer binds diffuse texture if nonexistant or unused by shader. (was firing a warning upon bind) 2011-04-23 00:59:20 -05:00
Shyotl
0b1b7c6618 Fixed issues with changing AA and AF...
-AF change no longer reloads the window to apply. Doing such isn't needed anymore.
-AA change no longer reloads the window to apply, IFF RenderUseFBO is true.
-AA change, IFF RenderUseFBO is false, reloads window. Texture issues under this scenario should be resolved.
-LLComboBox now updates control_name it's linked to, automatically.
-New LLComboBox Behavor when paired with new AA/AF application changes renders LLFloaterHardwareSettings::apply() pointless, EXCEPT for when changing AA while FBOs are off.
2011-04-23 00:58:27 -05:00
Shyotl
98c2b7e11f Sorted out high-res snapshot issues.
LL has since removed high-res snapshots using render targets. I find this change to be favorable, as rendertargets were very finicky to get working with anti-aliasing. Also, deferred rendering uses many rendertargets that depend on screen resolution. Changing resolution every screenshot is.. not very awesome.

There is some deviation from LL's viewer. I've kept the old tiled glow pass enabled for non-deferred, as it fixes issues with tile edges truncating glow propogation. However, this does no work with deferred yet. I need to pin down why. I assume using binding one of the RenderTargets is required for deferred.

Additionally, the usage of a RenderTarget for snapshots is what prevented me from fully enabling my supersampling settings. Now that that hurdle is gone, I consider including this new setting by default to be safe enough.

And a note: Do not remove the 'tiling' variable when merging with v2 changes, as singu's glow pass is 'special'. There are other fixes absent from LL's viewer that require knowing if the render is tiled or not. (water reflections/cloud freezing)
2011-04-21 23:36:41 -05:00
Shyotl
7b1736ea9d Merge branch 'master' into V2TextureSystem 2011-04-21 00:17:57 -05:00
Shyotl
673a338bf5 Merge branch 'master' into V2Renderer 2011-04-21 00:17:36 -05:00
Shyotl
d3c91698bf Removed crash vulnerability to malevolently malformed notecards. 2011-04-21 00:17:10 -05:00
Shyotl
ab20e881ce Local-lights now display in deferred
Fixed LLCachedControl<U32> caching invalid values
2011-04-20 20:08:42 -05:00
Shyotl
d2291b5903 Clamping prim settext max visible range to that of a 15^3 prim, because certain 'people' abuse megaprims to make annoying hovertext spam. 2011-04-18 01:44:40 -05:00
Shyotl
4c068a4a85 Clamping prim settext max visible range to that of a 15^3 prim, because certain 'people' abuse megaprims to make annoying hovertext spam. 2011-04-18 01:44:13 -05:00
Shyotl
eded2546fc Merge branch 'master' into V2TextureSystem 2011-04-17 20:42:59 -05:00
Shyotl
0c2ea7cc9b Static'd some llcachedcontrols. 2011-04-17 20:39:54 -05:00
Shyotl
cacf87e962 The collisions list is a vanilla C array of explicit size? Ugggh. 2011-04-16 23:44:32 -05:00
Shyotl
c816d25e68 The collisions list is a vanilla C array of explicit size? Ugggh. 2011-04-16 23:42:14 -05:00
Shyotl
2afa251b64 Added walking sound to collision list in sound explorer floater.
Undid some minor regression.
2011-04-16 21:11:34 -05:00
Shyotl
a6c802bd86 Added walking sound to collision list in sound explorer floater.
Undid some minor regression.
2011-04-16 21:11:14 -05:00
Shyotl
d32f820903 Merge branch 'master' into V2TextureSystem 2011-04-16 18:25:11 -05:00
Shyotl
c38a47ea48 Merge branch 'master' of git://github.com/siana/SingularityViewer.git 2011-04-16 18:24:34 -05:00
Shyotl
ad19c0209b Merge branch 'master' into V2TextureSystem 2011-04-16 18:23:41 -05:00
Shyotl
3901893a3a Resolved some unitialized variables. 2011-04-16 18:21:54 -05:00
Shyotl
d2d53fec7f Minor tweaks of little consequence. Nullcheck, overrun paranoia. 2011-04-16 18:21:38 -05:00
Shyotl
8204ec5565 New gpu_table entries 2011-04-16 18:20:35 -05:00
Shyotl
48538fe182 Resolved some unitialized variables. 2011-04-16 18:18:24 -05:00
Siana Gearz
68a95b5b1a Crashfix/sanity on Octopus 2011-04-16 02:09:49 +02:00
Siana Gearz
ef43a87ac0 Anti suicide kind of thing 2011-04-16 02:07:24 +02:00
Siana Gearz
0c2765511e Unhack some Inertia octree hack.
No performance change.
2011-04-15 18:33:19 +02:00
Siana Gearz
1a0387f918 Idle timeout goes down to 0 2011-04-15 17:12:51 +02:00
Siana Gearz
b9203e487a Don't need RLV assertions 2011-04-15 17:06:44 +02:00
Siana Gearz
4f9b8443e2 Should correct not being able to accept Vivox license 2011-04-15 17:04:32 +02:00
Shyotl
dbd26ddee1 Minor tweaks of little consequence. Nullcheck, overrun paranoia. 2011-04-15 02:42:30 -05:00
Shyotl
4d2dde73d7 New gpu_table entries 2011-04-15 01:21:33 -05:00
Shyotl
6cbbe493dd Removed warning regarding 'RenderCubeMap' feature upon startup 2011-04-13 02:48:40 -05:00
Shyotl
8ff0a29f9d Removed warning regarding 'RenderCubeMap' feature upon startup 2011-04-13 02:47:49 -05:00
Shyotl
f30dc32503 Media textures (browser and such) should now display 2011-04-13 02:44:04 -05:00
Shyotl
a35a59d56b Revert regression from merge 2011-04-13 01:28:56 -05:00
Shyotl
4d4c49cd24 Merge branch 'master' into V2TextureSystem
Conflicts:
	indra/newview/llviewerimage.cpp
	indra/newview/pipeline.h
2011-04-12 22:29:49 -05:00
Shyotl
aa1167e4d5 Un-borked Non-Deferred + Snapshot + RenderUseFBO + RenderGlow combination. 2011-04-12 17:47:45 -05:00
Shyotl
9e4bc6754a Merge branch 'master' of git://github.com/siana/SingularityViewer.git 2011-04-12 16:43:50 -05:00
Shyotl
c6fa0be39b Cleanup and render-to-texture tweaks.
Added two new debug render modes
Fixed bizarre issue with line-widths being sporadically inconsistent in ui. (needs glFlush for some reason)
2011-04-12 16:40:23 -05:00
Shyotl
15a8a86b15 Alphas can now glow as expected 2011-04-12 15:26:03 -05:00
Shyotl
125a90e46b Cleanup 2011-04-12 15:24:31 -05:00
Shyotl
e9147cb7fb Cleaned up overlapping elements in group properties panel 2011-04-11 22:19:49 -05:00
Shyotl
db5ba95f58 Fixed fast-alpha'd textures on hud attachments not rendering as fullbright 2011-04-09 19:44:27 -05:00
Siana Gearz
ab8656d5d8 Version 1.5.6(1) 2011-04-09 22:57:39 +02:00
Siana Gearz
711a4fdacd Revert "OpenJPEG 1.4 stable"
This reverts commit 3fca56df23.
2011-04-09 20:29:12 +02:00
Siana Gearz
156bb5415d Revert "Our old crashfixes for OpenJPEG"
This reverts commit 753c0b9285.
2011-04-09 20:28:34 +02:00
Shyotl
88fe5d6979 Eups. Compiles now. Hurr. 2011-04-09 01:30:48 -05:00