0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
97552d2e75
SL-16606: Add profiler category SHADER
2022-01-14 11:50:20 -08:00
028941652b
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llvertexbuffer.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/pipeline.cpp
2021-12-01 22:29:25 +01:00
68e09edad0
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
2021-11-30 17:04:35 -07:00
d881fa40d3
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-20 22:35:31 +01:00
28f9fb06a9
SL-16289 Rigged mesh rendering overhaul
2021-11-20 18:49:19 +00:00
4a59f6650f
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-15 18:10:02 +01:00
c1c2830f9b
SL-15391 Crash at getUniformLocation
2021-11-12 17:31:36 +02:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
d2dce17803
SL-16197 Optimize LLEnvironment handling of shader uniforms. Instrument LLSD. Enable Fast Timers when Tracy is enabled to catch Fast Timer overhead.
2021-10-19 02:26:41 +00:00
e7227afe02
SL-16166 Apply optimizations from pushBatch to other render call sites. Optimize out a map lookup in rigged face rendering.
2021-10-14 13:02:40 -05:00
d00272e0cc
SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and VAOs by default.
2021-10-11 16:03:40 +00:00
4c07eaa560
SL-16138 Add timing mark-up to shader fxns
2021-10-06 10:59:00 -06:00
f0e31b6c82
SL-16138 Avoid re-binding a shader which is already bound
2021-10-05 13:29:46 -06:00
675514bdb3
SL-16093 Don't force the console window to be open on developer builds because it causes frame stalls while logging.
2021-09-27 23:56:06 +00:00
f79890669d
SL-16006 and SL-16009 Rigged mesh rendering optimization pass
2021-09-20 18:58:09 +00:00
8a44c58dee
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-04-02 22:53:28 +02:00
d357bf7ae5
SL-14990 Turn on shader init logging after crash
2021-04-01 19:44:56 +03:00
93f1998a47
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-08 23:06:41 +01:00
d43b8d8551
SL-13019: Add debug logging of shaders used to track down macOSX / OSX GLSL linker errors
2020-04-15 15:54:38 -07:00
a387b38d20
Cleanup to coding standard
2020-04-15 15:54:38 -07:00
69efafe064
Merge viewer-eep
2019-08-04 16:20:35 +02:00
230c9b68d8
Remove binding and use of glIsShader for now (only useful for avoiding warnings about deleting shader objects re-used across programs).
2019-07-22 16:24:49 -07:00
b346624307
SL-10761
...
Make vograss objects set their face vert/index counts to 0 when setting
the number of blades to 0 to disable rendering so we don't allocate space
and then skip setting it up with actual index data in getGeometry.
2019-07-22 15:44:35 -07:00
676aa1398c
Merge viewer-eep
2019-05-08 19:18:01 +02:00
c4032528af
Roll back sRGB decode changes from contrib for now.
...
Fix direct light matching across alpha/blended-material/deferred.
Get diffuse lighting to match from Low to Ultra.
2019-05-02 13:49:35 -07:00
82c68aca0d
Merge viewer-eep
2019-04-17 21:12:55 +02:00
08812cbe06
Separate out vertex program objects from fragment program objects and use it.
...
Given that mShaderObjects only ever expects one copy of a given shader object (leading to lots of "shaderV" and "shaderF"), it made having utility shaders a bit more difficult to incorporate.
This change makes sure the two are separated. Using this over a multimap largely for readibility.
Also, actually, you know, use this functionality.
--HG--
branch : OPEN-340
2019-04-10 02:11:07 -07:00
52019b64e8
Merge viewer-eep
2019-04-03 18:45:39 +02:00
2513aa0ed1
Additional gamma correction work: start moving over to EXT_texture_sRGB_decode.
2019-03-30 03:18:02 -07:00
7fdc689a85
Merge viewer-eep
2019-03-21 20:54:50 +01:00
f8ad1551b3
Merge viewer-eep
2019-02-10 13:12:23 +01: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
acb6fda901
Merge viewer-eep
2019-01-26 00:02:49 +01:00
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
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
c699f816d1
Merge viewer-eep
2018-11-16 00:22:32 +01: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
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02: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
Ansariel