Commit Graph

72 Commits

Author SHA1 Message Date
Lirusaito
bb26127ed5 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2019-03-18 14:38:21 -04:00
Shyotl
30f6dc2b2d Allow more than 2gigs of texture memory... Fix shader buggles.
# Conflicts:
#	indra/newview/llviewertexturelist.cpp
2019-03-18 00:16:34 -05:00
Lirusaito
cd02bbd1cb Fix mixed iterators
Thanks Aru
2019-03-06 16:10:31 -05:00
Shyotl
736696ac36 Track glEnable states via static refs instead of map lookups.
Sync light state, bound shader, and various gl context states similarly to render matrices.
Texture handles now refcounted, as multiple viewer textures could ref the same handle (cubemaps do this)
Clean up gl extension loading a bit. Not necessary, but only look for ARB variants if not included in current core version. Removed unused extensions.
Use core shader api if supported, else use ARB. (FN signatures are identical. Just doing some pointer substitution to ARB if not core.)
Attempt at improving VBO update batching. Subdata updates better batched to gether per-frame.
There's probably other stuff I forgot that is in this changeset, too.

Todo: Fix lightstate assertion when toggling fullscreen with shaders off.
2018-11-19 00:37:48 -06:00
Shyotl
8fd728ca59 Clean up generated prepended shader preprocessor mess. 2018-02-04 23:06:16 -06:00
Shyotl
2195c2af37 And.. a missing line. 2018-02-04 23:01:38 -06:00
Shyotl
97a6f3a7b2 noisemap tweaks and cleanup. 2017-03-27 23:13:56 -05:00
Shyotl
75c47e96b6 Fixed numerous bugs. 2017-03-09 23:49:56 -06:00
Shyotl
5e501b9611 Removed TT_RECT_TEXTURE and removed unnecessary shaders. 2017-02-17 23:37:46 -06:00
Lirusaito
f14ad54c84 Linux compile fixes
Reapplies a fix from c3e593c20e

Updates libraries (FMOD Studio 1.08.01)

Don't use boost chrono, the standard has chrono!
2016-05-02 21:17:36 -04:00
Shyotl
be5d2f20bc llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default. 2016-04-11 02:51:08 -05:00
Lirusaito
c3e593c20e Fixes to gcc and debugs and such. 2016-02-15 16:35:31 -05:00
Lirusaito
6e3f404a1c Rip out old workarounds, hacks and macros for newer C++ features not being supported back in the day.
Adds LL_COMPILE_TIME_MESSAGE support to Linux.

llfinite -> std::isfinite
llisnan -> std::isnan
vector_shrink_to_fit -> vector.shrink_to_fit
2016-02-14 17:37:10 -05:00
Shyotl
1c627317ec No longer include llerrorlegacy.h. Updated llstl to include deletion utilites. 2015-06-19 03:54:20 -05:00
Shyotl
f6209dec34 Silence some LL_INFOS spam on shader init. 2014-09-15 15:23:22 -05:00
Shyotl
f7fdeeea9b Be super sure not to let rigged vert weights extend beyond actual joint count. 2014-02-10 20:18:39 -06:00
Latif Khalifa
269deb56e6 Fitted mesh 2014-01-24 01:11:27 +01:00
Shyotl
75f94d346d Fixed Alerics favorite assertion. 2013-12-24 20:21:55 -06:00
Shyotl
7da8b012e6 Pulled SSAO out into its own shader to support running at a lower-than-native framebuffer resolution (defaults at half-resolution [SHRenderSSAOResolutionScale=.5] ). This doesn't improve the slow ssao/shadow softening, however, as that bit remains unchanged. 2013-12-13 02:19:57 -06:00
Siana Gearz
a5103a1fc1 Sprinkle some Intel GPU support on Linux 2013-11-18 04:22:21 +01:00
Siana Gearz
749d0eec28 Merge https://github.com/abaph/SingularityViewer
Brings in support for MESA accelerators.
2013-11-17 16:38:06 +01:00
Shyotl
01e27eac76 Kill a tiny bit of dead code. 2013-11-13 13:06:47 -06:00
Andros Baphomet
997fdebb9f Re-fix shader compilation errors 2013-11-03 13:12:27 -05:00
Andros Baphomet
fe0a761ce6 Merge remote-tracking branch 'upstream/master'
Conflicts:
	indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl
	indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl
	indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
	indra/newview/app_settings/shaders/class1/deferred/giF.glsl
	indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
	indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
	indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
	indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
	indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl
	indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl
	indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
	indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
2013-11-03 12:17:50 -05:00
Shyotl
af8f8bb040 Mats. 2013-11-02 01:20:05 -05:00
Andros Baphomet
c009866d86 Merge remote-tracking branch 'upstream/master' 2013-10-30 09:42:58 -04:00
Shyotl
5e8c7264da Fix artifacts from local stash merge. 2013-10-26 19:58:54 -05:00
Shyotl
8441bc80a4 Use LLStaticHashedString for faster uniform lookup. 2013-10-26 16:26:46 -05:00
Andros Baphomet
12abca8954 Merge remote-tracking branch 'upstream/master' 2013-10-12 01:50:26 -04:00
Latif Khalifa
d98402b13f Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/newview/llvotree.h
2013-10-10 00:03:36 +02:00
Shyotl
f25eb07fab Unstaged changes cleanup. Further vectorization. Change in binormal/bitangent calculation. 2013-10-09 15:43:23 -05:00
Andros Baphomet
7ab20726e4 Merge remote-tracking branch 'upstream/master'
Conflicts:
	indra/llrender/llshadermgr.cpp (resolved)
2013-10-06 10:32:23 -04:00
Andros Baphomet
f6861cd5ba Fix shader compilation/out-of-spec issues 2013-10-05 17:33:34 -04:00
Latif Khalifa
4118afc146 Boost upgrade to 1.52 2013-10-05 20:27:20 +02:00
Shyotl
45b85070f3 A bit of harmless cleanup, null checking, nan checking. Removed sphericalProjection and cylindricalProjection from llface (broken/dead). 2013-07-29 19:23:30 -05:00
Shyotl
b20f39d09f Retain shader error logs across entire session. 2012-12-19 19:06:59 -06:00
Shyotl
6b05022530 Applied Tofu Linden's SSAO improvements. e189d55a7b 2012-12-08 16:51:38 -06:00
Shyotl
e8ec81bf04 Experimentation with normalpacking and component precision. 2012-10-14 04:00:02 -05:00
Shyotl
afc7c2b449 Better robustness when loading shaders. Redundant shaders (eg: "deferred/shadowF.glsl") will only need to be compiled once, and LLShaderMgr::mShaderObjects won't have previous entries mistakenly overwritten as a result. 2012-09-14 02:33:07 +02:00
Siana Gearz
29adc28d80 ivec4 still needed as texture index on some SONY VAIO and Toshiba ATI drivers.
This reverts commit b8b235df09.
2012-09-02 19:26:28 +02:00
Siana Gearz
e460bd9a69 Yet another attempt at getting old ATI drivers not to do all pink 2012-09-01 01:35:35 +02:00
Siana Gearz
c84e145557 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/llrender/llrendertarget.cpp
	indra/newview/lloverlaybar.cpp
2012-08-09 02:11:14 +02:00
Shyotl
b8b235df09 And suddeny the texture index attrib(for batching) is now an integer! (Changing switch to an if block on nividia hardware seems like the real solution to pink textures... not the index datatype) 2012-07-20 12:03:41 -05:00
Drake Arconis
ccb914ea83 General cleanup of OSX support - not done
Updated with new cursors from LL
Corrected mispackaged OSX Libs
Corrected mouse flicker on menus

Signed-off-by: Drake Arconis <lightdrake@gmail.com>
2012-07-15 17:45:50 -04:00
Shyotl
1d60131df7 Avoid switch statement in shaders on nvidia hardware, since some driver versions don't behave properly, apparently.. 2012-07-12 16:25:27 -05:00
Shyotl
67e1a3b004 Lindie viewer-dev catchup regarding rendering pipeline. 2012-06-30 20:05:31 -05:00
Shyotl
eb562c2470 Updated deferred rendering (STORM-1819 Ternary/Graded shadows) 2012-05-22 23:36:38 -05:00
Siana Gearz
70438fa06f Catching up with Lindies part 3 2012-03-26 15:01:53 +02:00
Siana Gearz
3f0f955a76 Catching up with Lindies part 2 2012-03-25 10:47:20 +02:00
Siana Gearz
c542c7bdbb Work around pink textures on ATI with 3.1<=GL<=3.2 2012-02-15 01:01:11 +01:00