livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69,704 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

281 Commits (b4fde14f0975698dee2402733e22332960cbe5dd)

Author SHA1 Message Date
Ansariel b4fde14f09 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llrender/llimagegl.cpp
#	indra/llrender/llrender.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llrender/llvertexbuffer.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/lldrawpool.cpp
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpoolbump.cpp
#	indra/newview/lldrawpooltree.cpp
#	indra/newview/llface.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llspatialpartition.h
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp
 2023-01-19 23:04:50 +01:00
RunitaiLinden 7bd9d21e19
Optimizations, decruft, and intel compatibility pass (#53) 
SL-18869, SL-18772  Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
 2023-01-19 09:13:45 -06:00
Ansariel b3eed96c20 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
#	indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl
#	indra/newview/llpanelface.cpp
#	indra/newview/llreflectionmapmanager.cpp
#	indra/newview/llviewershadermgr.cpp
#	indra/newview/llviewershadermgr.h
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/floater_stats.xml
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
 2022-11-16 15:44:33 +01:00
Jonathan Goodman 97277e74a9 Merged in SL-18332 (pull request #1194) 
First pass of Screen Space Reflections

Approved-by: Dave Parks
 2022-11-14 18:12:22 +00:00
Dave Parks 843a5c287e SL-18485 Cleanup -- remove unused GLTF specific vertex attributes from LLVertexBuffer (blows past 16-attribute limit) 2022-11-14 11:40:18 -06:00
Ansariel d3a1b88511 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-11-11 11:29:58 +01:00
Cosmic Linden 9e7b725c15 SL-18485: Render GLTF materials with extension KHR_texture_transform with approprate texture transforms 2022-11-02 12:55:18 -07:00
Ansariel b80fefa0ab Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable.txt
#	indra/newview/featuretable_mac.txt
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
 2022-10-13 13:33:56 +02:00
Dave Parks 42ec639c86 SL-18190 Remove water reflection detail combo box and reimplement "Transparent Water" checkbox. 2022-10-12 14:46:51 -05:00
Ansariel 5763aa32cc Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/llreflectionmapmanager.cpp
#	indra/newview/llsettingsvo.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/pipeline.cpp
 2022-10-12 16:25:18 +02:00
Dave Parks 1900df3615 SL-18293, SL-18190 -- Fix for debug displays not showing up (wireframe still busted). WIP on reflection probe/PBR driven water shader. 2022-10-04 12:20:19 -05:00
Ansariel 4dce4759e4 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-10-01 14:47:34 +02:00
Dave Parks 2e499bcc40 SL-18190 Prune srgb_to_linear from atmosphericsFuncs.glsl 2022-09-28 19:14:00 -05:00
Dave Parks aaf7b17db0 SL-18190 WIP -- Take 2 on linear space windlight (more methodical approach -- make desired interface but brute force color conversions). Placeholder PBR water and move to deprecate forward rendering shaders. 2022-09-27 23:32:02 -05:00
Ansariel 87501c03ae Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llrender/llrender2dutils.cpp
#	indra/newview/llreflectionmapmanager.cpp
#	indra/newview/llviewershadermgr.cpp
#	indra/newview/llviewershadermgr.h
 2022-09-20 11:37:09 +02:00
Dave Parks b2cf07f53c WIP - switch PBR implementations 2022-09-17 01:12:52 -05:00
Ansariel 82e545fa92 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-09-14 09:22:29 +02:00
Dave Parks ff3a28422d SL-17701 WIP -- Parity for point lights between opaque and transparent PBR materials 2022-09-13 17:07:30 -05:00
Ansariel 1f176fdc18 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llmath/llvolume.cpp
#	indra/llrender/llglslshader.cpp
#	indra/llrender/llpostprocess.cpp
#	indra/llrender/llrender.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/llvieweroctree.cpp
#	indra/newview/llviewershadermgr.cpp
#	indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
 2022-09-13 20:11:44 +02:00
Dave Parks 60cc58fbfc SL-17967 Fix for confounding program and shader objects when fetching logs and fix for gl errors on AMD windows 2022-09-02 21:05:53 -05:00
Howard Stearns 013a713001 SL-17967 - slightly more meaningful ogl error reporting 2022-09-02 15:44:19 -07:00
Howard Stearns 2082443220 SL-17967 - Git rid of ARB that is in core 2022-09-01 10:58:27 -07:00
Ansariel b0f88bef63 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-08-30 11:25:02 +02:00
Andrey Kleshchev 664ba53e4c SL-17584 Make setShaders crashes more informative 2022-08-20 00:35:02 +03:00
Ansariel abf0d2e92b Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llrender/llgl.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llvovolume.cpp
 2022-06-29 23:11:18 +02:00
Dave Parks 5cfc336ba2 Fix for 2-bit errors in writing to and reading from norm.w 2022-06-28 18:46:48 -05:00
Dave Parks 254bbc86e5 Add emissiveRect to softenLightF.glsl 2022-06-28 15:39:04 -05:00
Ansariel 536e958018 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/CMakeLists.txt
#	indra/newview/llface.cpp
#	indra/newview/llfilepicker.h
#	indra/newview/llinventoryicon.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvovolume.h
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/textures/textures.xml
#	indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
 2022-06-27 17:58:22 +02:00
Dave Parks 9439c721f4 SL-17274 Hook up emissive map and non-texture parameters to pbropaqueF.glsl 2022-06-24 12:15:34 -05:00
Michael Pohoreski ac62a74458 Merged DRTVWR-559 into SL-17274_gbuffer_flags 2022-06-23 15:42:42 +00:00
Michael Pohoreski d67e1f4f91 Merged DRTVWR-559 into SL-17274_view_dir 2022-06-23 14:53:07 +00:00
Ptolemy 4d2b2f464b SL-17274: Add GBuffer flag for PBR 2022-06-22 11:32:10 -07:00
Dave Parks d0d1b832d4 SL-17600 Proper irradiance probes. 2022-06-22 13:25:50 -05:00
Ptolemy 27ca7760cc SL-17274: Remove hard-coded magic number checking if G-Buffer flag is set 2022-06-21 22:23:38 -07:00
Ptolemy 77b96114c3 SL-17274 Cleanup hard-coded gbuffer atmos flag for softenlight 2022-06-21 22:00:12 -07:00
Ptolemy 36d9fa9015 SL-17274: Add view_dir uniform 2022-06-21 16:50:09 -07:00
Dave Parks 929abcd296 SL-17523 Add reflection probe ambiance to windlight settings and integrate with UI and ReflectionMapManager 2022-06-10 16:36:38 -05:00
Ansariel 3765c775cb Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-05-21 15:04:54 +02:00
Dave Parks 3564b24e2a SL-17286 Reflection probe alpha/fullbright support. 2022-05-19 22:24:41 -05:00
Dave Parks 3400e5fd30 SL-17284 Reflection probe tuning and optimization take 1 2022-05-16 17:21:08 +00:00
Dave Parks 93a0259666 SL-17282 prototype mixing of reflection map into legacy materials 2022-04-29 13:51:11 +00:00
Ansariel 47e2173239 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable.txt
#	indra/newview/featuretable_mac.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/pipeline.h
 2021-12-16 08:42:54 +01:00
Dave Parks 5e5be92d79 SL-16202 Put Multi-threaded GL behind a feature flag and update featuretable (decruftify settings, compatibility pass). 2021-12-06 15:29:34 +00:00
Ansariel 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
Dave Houlton 68e09edad0 SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction 2021-11-30 17:04:35 -07:00
Ansariel d881fa40d3 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-20 22:35:31 +01:00
Dave Parks 28f9fb06a9 SL-16289 Rigged mesh rendering overhaul 2021-11-20 18:49:19 +00:00
Ansariel 8a44c58dee Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer 2021-04-02 22:53:28 +02:00
Andrey Kleshchev d357bf7ae5 SL-14990 Turn on shader init logging after crash 2021-04-01 19:44:56 +03:00
Kitty Barnett c8286c2403 Merge branch 'rlva/development' 2021-02-13 13:56:46 +01:00