Shyotl
9bda97786f
Batch indexing/no-fixed-function WIP.
2011-08-09 01:11:05 -05:00
Shyotl
550fa0a160
Merge branch 'future' of https://github.com/AlericInglewood/SingularityViewer.git into V2Mesh
...
Conflicts:
indra/newview/llspatialpartition.cpp
2011-08-05 19:40:35 -05:00
Shyotl
7bcd259821
Added ShyotlRenderVBOStrideMode to toggle between strided and unstrided VBOs.
2011-08-05 19:24:17 -05:00
Shyotl
b75a28ec15
Cleanup. Applied http://hg.secondlife.com/mesh-development/changeset/3031f266784a
2011-08-05 01:18:27 -05:00
Siana Gearz
aa469d860f
Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future
2011-08-01 19:56:33 +02:00
Shyotl
e21c9637ae
Added some glFlushes to lessen framestalls
2011-07-31 19:01:59 -05:00
Shyotl
b258b71e07
Flipped the MESH_ENABLED switch. Added missing components and updated stuff to be closer to mesh-development head.
2011-07-30 20:30:07 -05:00
Shyotl
48ef9904c1
A pass at cleaning up LLVertexBuffer a bit. Also removing extra unbinds that caused synchronization issues with mapped vbos.
2011-07-21 01:48:46 -05:00
Shyotl
cc19a4c2da
Aligned strided vertexbuffers.
2011-07-20 23:54:16 -05:00
Siana Gearz
f30c284063
Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future
...
Conflicts:
indra/llvfs/lldiriterator.cpp
indra/newview/app_settings/settings.xml
indra/newview/llviewerregion.cpp
2011-07-21 00:20:06 +02:00
Shyotl
9e061d5e35
Apparently MacGL crashes on for loops of variable length. Also, cleaned up a few minor things.
2011-07-18 03:30:58 -05:00
Shyotl
66336e8151
Now letting LLRenderTarget delete bound textures immediately instead of having them hang around until next frame.
2011-07-17 19:48:37 -05:00
Siana Gearz
144d96f78c
Fixfudgery
2011-07-13 05:42:52 +02:00
Shyotl
43fd687b7c
Fixed nullptr call on shutdown.
2011-06-13 23:20:45 -05:00
Shyotl
fef7ce9f76
Updated LLSelectMgr
2011-05-30 19:56:00 -05:00
Shyotl
95ea174d43
Spatial partition updated. Seems to run smoother for me, but may want to test on other systems.
2011-05-29 16:28:56 -05:00
Shyotl
71eec1caed
Improved error handling (introduced debugsession commandline argument). Startup/shutdown now more verbose. SSE checks if project was compiled with SSE(2)... not sure if windows would reach it if hardware lacked support, but linux/mac may (from V2). Fixed Mac crashes in deferred.
2011-05-28 01:46:11 -05:00
Shyotl
4663b605ef
Added fullbright shiny underwater shader.
2011-05-18 17:00:44 -05:00
Shyotl
62e3aa10c1
Reasonably safe changes.
...
Using accessor for vertexbuffer in LLFace
Extra occlusion query lookup in llgl (unused)
Const changes.
2011-05-18 14:35:27 -05:00
Shyotl
d1d6994419
Full v2.6 renderer.
2011-05-12 00:13:38 -05:00
Siana Gearz
e3f9b4dbbe
Help me keep track of VBOs
2011-05-07 05:47:13 +02:00
Shyotl
65c2a46121
Workaround for depth+stencil blitting on AMD(Ati) hardware, plus alteration to blitting to framebuffer when using MSAA.
2011-05-02 17:02:44 -05:00
Shyotl
4f264f0359
Testing potential fix for http://code.google.com/p/singularity-viewer/issues/detail?id=5
2011-04-25 19:59:50 -05:00
Shyotl
ac12349a8a
Merge branch 'V2Renderer' into V2TextureSystem
...
Conflicts:
indra/newview/llviewercontrol.cpp
2011-04-23 19:33: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
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
48538fe182
Resolved some unitialized variables.
2011-04-16 18:18:24 -05:00
Shyotl
dbd26ddee1
Minor tweaks of little consequence. Nullcheck, overrun paranoia.
2011-04-15 02:42:30 -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
Siana Gearz
b34d9fb88e
MultiAttach unbork attempt
2011-04-01 05:13:39 +02:00
Shyotl
e756140e1d
Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.
...
Need to test:
localassetbrowser
preview related floaters
hgfloatertexteditor
maps
media textures! Currently very hacky
web browser
alpha masks on avatars
bumpmaps
Are all sky components appearing?
LLViewerDynamicTexture (texture baking, browser, animated textures, anim previews, etc)
Snapshot related features
Customize avatar
vfs floater
UI textures in general
Texture priority issues
2011-03-31 03:22:01 -05:00
Shyotl
b887d3147e
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
...
Conflicts:
indra/llrender/llglstates.h
2011-03-25 17:54:52 -05:00
Shyotl
f73c666f0e
Added isAgentAvatarValid() helper function from v2
...
Nullchecks
Flight-state tweaks
2011-03-25 17:50:06 -05:00
Siana Gearz
86f7987e13
build fix, cleanup
2011-03-25 22:09:42 +01:00
Shyotl
0150bac422
LLGLState::sStateMap now using hash map (boost::unordered_map) opposed to std::map
2011-03-24 05:03:21 -05:00
siana
15c01ed310
Merge remote branch 'shyotl/V2Renderer'
...
Conflicts:
indra/cmake/00-Common.cmake
2011-03-20 04:55:56 +01:00
Siana Gearz
7b98e5f2f1
OpenSim crash fixes, thx to Henri and Zauber
2011-03-15 15:26:48 +01:00
Shyotl
a8ef46888e
More STORM-1026 LL fixes.
2011-03-14 17:03:34 -05:00
Shyotl
1b039a1be6
Deferred has sky and water textures now. Underwater is still borked.
...
Deferred fastalpha behaves a bit better.
Pulled over patch for https://jira.secondlife.com/browse/STORM-336 and https://jira.secondlife.com/browse/STORM-1011 from linden repo
Sky rendered using new LL method. Assuming this fixes issues on AMD cards(works on cat 11.2)
Added a few things missed related to spatial-parition updating.
Added 'SkipReflectOcclusionUpdates' setting that prevents occlusion updates for reflection pass. Less taxing on CPU.
2011-03-10 23:06:46 -06:00
Shyotl
996aaf6345
V2 spatial partition, and all the pipeline changes that go with it.
...
Note: Deferred mode is not finished, and thus broken. Don't use!
2011-03-10 23:05:04 -06:00
Shyotl
56b327ff97
Possibly fixed pickmask (altcam+alpha issues). Uninitialized variables.
2011-03-02 20:23:37 -06:00
Shyotl
58edba5129
V2 llrender merge, sans freetype and LLTexture
2011-02-24 18:08:17 -06:00
Shyotl
456bec3e83
Fixed snapshot floater failing to render overlay texture when full-screen preview is enabled
...
Enabled bulk glReadPixels for snapshots if target-resolution matches render-resolution
Snapshot thumbnail generated from downscaled render image, instead of requring an extra pass.
2011-02-16 18:19:22 -06:00
Shyotl
257a971fcd
Removed bloom tab from post-process menu.
2011-02-15 17:19:23 -06:00
Shyotl
796ea0db88
Non-standalone actually compiles on linux now...
2011-02-15 03:46:48 -06:00
Shyotl
fef4e2196c
When typos attack! (Things break)
2011-02-12 14:33:40 -06:00
Shyotl
7d3e9723c3
Reduced LL's leakage of program/shader objects, drastically.
...
Re-structured some shader loading/unloading handling.
These changes are pretty experimental. I'll be holding off of tweaking the paramater managers(among other things) until I know if this stuff is working correctly.
2011-02-10 18:21:38 -06:00
Shyotl
d0feea7ed7
Re-added gamma setting to color filter shader
...
Fixed issue with setting default values of sliders for gauss shader
2011-02-10 14:57:00 -06:00
Shyotl
a579663eb9
Added Gaussian blur post-process shader
...
Added ability to manually input values in post-process shader menu
2011-02-10 04:03:22 -06:00