898c9f4421
Mods to make merge with viewer-release have less whitespace-only change and fix diffs between EEP and VR.
2019-03-13 13:21:48 -07:00
868cd32e5e
More tab restoration.
...
Also fix ref to removed extra GLSL link module.
'warn-on-failure:no-tabs'
2019-03-12 11:07:23 -07:00
15270f697a
Tab restoration project.
...
'warn-on-failure:no-tabs'
2019-03-12 10:52:00 -07:00
53f3755a46
Fix tabs.
2019-03-07 15:09:34 -08:00
423fa1ac29
SL-10618, SL-10698
...
Fix reflection/distortion map culling planes again.
Fix broken handling of shadow disables in ALM forward shaders.
2019-03-07 10:56:26 -08:00
acbc7f4cdd
SL-10415, SL-10434
...
Further tweaking of directional shadow sampling to balance between peter-panning and shadow acne.
Move stars to just this side of the sky some to reduce parallax.
Remove decodeNormF and uses of decode_normal in favor of unified use of getNorm
(try to help the Intel HD x000 compiler learn to link correctly).
2019-01-30 08:37:07 -08:00
7e9033821a
De-duplicate deferred gbuffer access for getPosition/getNorm.
...
De-duplicate ambient occlusion shader code and move to new aoUtil.glsl
Split shared shadow tap funcs into shadowUtil.glsl
2018-12-06 10:59:11 -08:00
a49e2b604e
SL-10044 SL-10045
...
Fix class 1 and 2 transport/gamma funcs and made usage consistent across all shaders.
Fix class1\environment\waterV reverting to old d1/d2 names for wave directions.
2018-11-12 15:54:53 -08:00
2929998982
Move to using a shared deferredUtil object for getting pos/norm from gbuffer.
...
Eliminate 20+ callsites with copy-paste of getPosition and/or getNorm code.
Make pipeline use getShadowTarget/releaseShadowTarget consistently.
2018-11-06 19:33:04 +00:00
fb335cc243
SL-10000 fix storing of ambient value when converting legacy settings
2018-11-01 18:26:24 +01:00
536799d07e
SL-9977
...
SL-9973
2018-10-29 23:02:20 +01:00
2e55eae9cc
Merge and fix MAINT-9087 and MAINT-9084
2018-09-04 23:08:20 +01:00
6dd9dd3ab6
MAINT-9064
...
Fix binding of current/next sun/moon textures.
Remove redundant code in GLSLShader determination of tex uniform bindings.
Unhack mix calls in sun/moon shaders to reverse sense of blending (was working around reversed bindings).
2018-08-30 17:54:59 +01:00
a0598b1265
Fix water fog consolidation in underwater shaders.
...
Add plumbing facilities to allow current and next moon textures to be passed to moon shader.
Modify moon shader to blend between current and next moon textures by blend factor.
2018-06-11 17:46:16 +01: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
37e8fd20c3
Merge to 5.1.6
2018-06-01 15:34:21 +01:00
bd84cbfa11
Merge
2018-05-31 11:49:27 -07:00
190fa8614c
Remove MSVC debug pragmas and comment out code to dump example grids.xml file w/ hard-coded grids.
2018-05-18 23:16:56 +01:00
3116416fcb
Le Merge
2018-05-01 00:10:11 +01:00
98b2fed85f
De-duplicate shader code for encoding and decoding normals to/from gbuffer format.
2018-03-12 17:52:04 +01:00
cf460b13be
De-duplicate sRGB conversion funcs from many shaders
...
and unify on using the version that works on OSX.
Add more logging to shader loading about fallbacks and loading succcess.
Add frag shaders for sharing sRGB and normal encode/decode via GL shader linkage.
2018-03-12 16:24:16 +01:00
5517eb3f6f
Remove MSVC pragmas breaking OSX build.
2018-03-03 01:08:58 +00:00
6303ef5763
Redo advanced atmo shader integration with SL.
2018-02-26 16:38:50 +00: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
55990724a3
Keep attributes name (useful for debug)
2018-01-30 17:07:00 +02:00
df376c0299
MAINT-6437 - Tile-Based Texture Animation Scales Incorrectly for Rigged Mesh when worn (MacOS only)
...
FIXED.
2017-12-26 18:20:06 +02:00
0d414c1fb5
Clouds still funky but better.
2017-09-26 09:19:20 -07:00
5d3599f5d1
Merge
2017-09-22 09:18:34 -07:00
d4d0520f38
Cleanup inside GLSLShader for uniform mapping.
2017-09-20 14:29:36 -07:00
d1ab470542
DRTVWR-418: Fix C++ errors detected by Xcode 9.
...
You can't legitimately perform an ordered comparison between a pointer and an
int, even 0. Fix a number of 'if (ptr > 0)' to plain 'if (ptr)'.
Fix LLEditWearableDictionary::WearableEntry constructor to avoid varargs
mechanism. It used to accept three different counts, followed by three
different lists of enums, fetched in each case as 'int' -- dubious in itself.
The constructor body performed three different loops to populate those enums
into three different member vectors.
Instead, make the constructor accept three vectors and initialize the member
vectors from the passed vectors. Now that C++ has inline vector
initialization, change existing constructor calls to pass temporary vectors
initialized with what used to be the varargs enum values.
2017-09-20 16:58:58 -04:00
5fb30e5ad3
MAINT-6913 - (Via Sovereign Engineer and Shyotl Kuhr) Pack the skinned matrix and translation into a single mat3x4 for optimal data transfer to reduce uniform slot usage.
2016-11-11 09:37:45 -05: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
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
48016ff54b
MAINT-6286 Viewer 4.0.3.312680 ignores settings for Shaders in Graphics Preferences for ATI Radeon HD 3800 Series graphics card
2016-04-12 19:29:35 +03:00
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
173886fec3
MAINT-1109 FIXED Toggling graphics options causes viewer memory to increase, eventually causing the rendering pipeline to fall over and crashing the viewer
...
Patchset #2
2016-03-10 19:50:12 +02:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
cbdf791fb1
MAINT-1109 Toggling graphics options causes viewer memory to increase, eventually causing the rendering pipeline to fall over and crashing the viewer
...
Te reason of memory leak - unloaded shaders.
Fixed.
2015-12-01 19:57:38 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
4f8f739a98
MAINT-3568 Mac OS X, ALM, Full Bright, Shininess
...
The reason of this bug the same as was in MAINT-4165, MAINT-4839.
I.e. in short: SL engine is sensitive to the uniform variable location.
2015-10-02 19:25:05 +03: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
a882d7a02b
Fix for gpu_bench crash without parallels knock-on
2014-11-18 12:54:13 -08:00
9eeb8344a6
Avoid using GL_ARB_timer_query functionality when not supported and protect against probably-not-NULL current bound shader pointer
2014-11-17 11:40:28 -08:00
d0428575fb
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2014-06-19 13:14:42 -05:00
24f8745914
MAINT-3131 Use benchmark to determine GPU class instead of GPU table.
2014-03-19 17:57:00 -05:00
5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
ff8b002c3b
Quite down log spam from loading shaders.
...
Up bone cap to 64 for rigged meshes.
2013-10-10 13:56:06 -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
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07: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
f86a7c04d3
NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac 10.6.8 nV driver issues
2013-07-30 11:33:58 -07:00
f357269c38
NORSPEC-325 WIP restore gamma (uncorrected) attenuation and unify sRGB conversion in one place
2013-07-25 09:36:13 -07:00
d6d2f74fbb
NORSPEC-290 Shader optimization WIP -- compatibility pass with OpenGL 3.3, slight cleanup.
2013-07-01 16:27:20 -05:00
d262ca32d3
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-07-01 10:59:46 -05:00
bd41392b7e
Merge with viewer-bear which was just merged with viewer-release
2013-06-28 13:36:41 -07:00
380785e613
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-27 16:16:56 -05:00
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
ccd04cd66c
Occlusion culling overhaul.
2013-06-18 17:24:21 -05:00
473474b949
Revert changes for MAINT-2616 due to licensing issues, need a full patch
...
submitted to be acceptable
2013-05-22 16:51:42 -07:00
abdbf45aaa
MAINT-2616 : Updated my Intel driver and now have orange in buttons and
...
Inventory pull down bar causing blinks to screen. Pulled in FS code,
Reviewed by Kelly
2013-05-20 11:18:12 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
1688e995eb
Provide LLGLSLShader backwards compat so as not to break the appearance utility
2013-04-26 09:11:52 -07:00
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
b2344cfd13
Fix rendering artifacts on Mac Mobile GeForce cards
2013-04-20 03:36:21 -07:00
f964e51fc9
Fix for mac build
2013-04-15 15:31:57 -05:00
8025b8b2bc
NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where available
2013-04-15 13:16:14 -05:00
679a095aa0
NORSPEC-74 Fix for assert when Debug GL enabled when rendering materials.
2013-04-02 15:45:17 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
df08808640
Improve perf of GLSL uniform lookups by name
2013-02-28 09:33:41 -08:00
2ae4b6976b
Added a new draw pool specifically for faces with materials applied to them. Removed materials rendering from the bump draw pool, and reverted it to its previous state.
2013-02-04 11:32:05 -05:00
e606677ed8
Added the ability to remove a preprocessor define.
2012-08-29 04:56:54 -04:00
99371f892e
Added new bindTexture and unbindTexture API to LLGLSLShader. Reviewed by davep.
2012-08-28 14:44:28 -04:00
ed1b78e322
Added support for adding custom preprocessor definitions (for shader permutations)
2012-08-28 10:33:32 -04:00
67221663fe
MAINT-616 Fix for mac build.
2012-05-30 14:55:34 -05:00
b7cfd8c7f0
MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update
2012-05-21 23:33:25 -05:00
3267b42ee5
SH-2908 Temporary fix for mac build
2012-02-13 18:26:48 -06:00
3710c6110d
SH-2908 Rework indexed texture rendering to use a uvec4 instead of a float for texture indices in the data stream. Also rework gl_FragColor overrides to not collide with some odd driver implementations.
2012-02-10 20:04:19 -06:00
e0582d4bc7
Fix for Debug GL generating errors when changing graphics preferences (reloading shaders).
2012-02-08 19:01:08 -06:00
71a660e006
* Fixed up shader compilation errors to get lighting and shadows working again on Mac.
...
* Cleaned up vertex buffer allocation to guarantee allocation and deallocation using the same allocation methods from the same pools.
* Added new shader feature for atmospheric helpers in the absence of lighting.
Reviewed by davep.
2012-01-26 10:17:41 -08:00
9fa68f0da3
SH-2743 Fix for shader compiler error on some GL 3.x implementations.
2011-12-14 17:55:36 -06:00
2179e1c1f2
SH-2541 Fix for speckles on avatar on some cards -- don't use "maximum_alpha" for alpha tests in shaders as it was always being set to 1.0 anyway.
2011-11-02 13:13:38 -05:00
6c157557dc
SH-2510 Potential fix for crash on startup on systems that don't have GL_ARB_shader_objects
2011-10-12 10:51:10 -05:00
2322c57b4d
SH-2545 Fix for transparent water option doing nothing when shaders are enabled.
2011-10-11 14:55:33 -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
b8b0886f3e
SH-2507 Fix for linux build
2011-09-28 16:55:41 -05:00
348a701812
SH-2507 Shave some unused/redundant varying state and make the max texture index debug setting rebuild shaders to use no flow control when set to 1 or lower
2011-09-28 00:41:10 -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
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
9ea41c8094
SH-2243 No deprecated calls for the whole session.
2011-09-20 00:54:37 -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
530981a214
SH-2243 work in progress -- no more deprecated built-in matrix state when using shaders.
2011-09-15 00:54:25 -05:00
bf0d36bf88
Mac rendering now with 100% fewer crashes when enabling shadows.
2011-08-24 15:41:00 -07:00
2ee8154780
SH-2238, SH-2223, SH-SH-2242 glVertexAttrib throughout main render pipeline complete, preview renders and debug displays still pending. Also fixed a render glitch and a crash (JIRAs listed).
2011-08-10 13:01:14 -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
190ff3c346
SH-2031 Fix for link error in llui_libtest
2011-07-18 10:39:02 -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
253642ccff
SH-1903 Don't use indexed texture rendering when GL version is < 3.1 (fixes bad performance on cards with old drivers)
2011-06-23 23:06:36 -05:00
ffab1eef57
Mac build fixes.
...
Reviewed by davep.
2011-06-03 16:24:07 -07: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
eca17c8993
SH-1682 Full integration if indexed texture rendering to improve batch size.
2011-05-30 01:25:55 -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
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
4fc7a221e1
Disable uniform map checking for now (breaks on several valid edge cases).
2010-10-12 17:04:41 -05:00
21b1b91c44
ATI compatibility pass
2010-10-06 12:53:26 -05:00
62943202a7
Make rigged attachments respect under water rendering.
...
Reviewed by Nyx.
2010-08-13 14:42:07 -05:00
f324787a70
Rigged attachment integration WIP.
2010-05-01 00:45:44 -05:00
47ffcdb93d
Rigged attachments (almost works).
2010-04-06 16:24:08 -05:00
22ccfab764
CID-295
...
Checker: UNINIT_CTOR
Function: LLGLSLShader::LLGLSLShader()
File: /indra/llrender/llglslshader.cpp
--HG--
branch : product-engine
2010-02-03 17:57:47 +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
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
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
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
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
Graham Linden