8dc59e5ef3
SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD
2022-09-16 16:25:26 -05:00
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
2082443220
SL-17967 - Git rid of ARB that is in core
2022-09-01 10:58:27 -07:00
6259666be0
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/lloctree.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/installers/windows/lang_da.nsi
# indra/newview/installers/windows/lang_de.nsi
# indra/newview/installers/windows/lang_en-us.nsi
# indra/newview/installers/windows/lang_es.nsi
# indra/newview/installers/windows/lang_fr.nsi
# indra/newview/installers/windows/lang_it.nsi
# indra/newview/installers/windows/lang_ja.nsi
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/installers/windows/lang_pt-br.nsi
# indra/newview/installers/windows/lang_ru.nsi
# indra/newview/installers/windows/lang_tr.nsi
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvovolume.cpp
2022-06-22 21:11:47 +02:00
ed36165f29
SL-17584 Frame buffer object is now nessesary to run viewer
2022-06-15 18:03:11 +03:00
8e4abf8ea3
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-06-10 13:52:52 +02:00
509476f95e
SL-17574 Add probe detail combo box to advanced graphics preferences. Fix spot light shadows not working in probes.
2022-06-10 01:13:41 -05:00
3765c775cb
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-05-21 15:04:54 +02:00
6eaf8521ab
SL-17287 Instrument and optimize cubemap render. Fix for cubemap snapshots doing a full resolution render instead of a 512x512 render.
2022-05-20 19:05:28 -05:00
6c6d9a10f8
SL-17287 Update Tracy to 0.8.1. Clean up GPU instrumentation.
2022-05-20 13:31:18 -05:00
93260cfeff
SL-17283 LLReflectionMapManager prototype. Remove snapshot code related overhead from reflection map renders. Add parallax correction and support for multiple reflection maps.
2022-05-04 16:07:50 +00:00
63c8280325
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-03-08 16:20:47 +01:00
9dc8fee0f5
SL-16928 Fix for broken bumpmaps on Intel GPUs
2022-03-04 17:05:05 -06:00
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
a35544c701
SL-16027: Add Tracy OpenGL support
2021-09-21 16:10:52 -07:00
3d37c73654
Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer
2020-06-17 12:10:58 +02:00
84d3065596
SL-13281, add missing srgb->linear conversion for specular
2020-06-11 23:33:14 +03:00
c7eddc5fd9
Remove Nicky's Intel fix in favor of upcoming changes from LL
2019-07-20 14:08:54 +02:00
d82f98180c
Merge Firestorm LGPL
2019-07-12 20:13:35 +02:00
dc10db962f
BUG-225655/FIRE-24049; Add an implemention for render targets without FBO. As the target FS uses for bakes (mPhysicsDisplay) does not have a FBO.
2019-07-11 11:40:35 +02:00
63af01fd72
BUG-225655/FIRE-24049; Intel driver >= 24 64 bit get a hack of toggling the FBO once before glReadPixels. Make this as specific tailore as possible for only those systems, as it is not a nice hack.
2019-07-06 19:11:06 +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
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05: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
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
0c60e32808
Merge
2013-10-21 16:57:38 -06:00
0e116741a0
MAINT-2968 Fix for crash on AMD hardware running current drivers.
2013-10-10 18:00:11 -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
badb8a945d
NORSPEC-259 revive fix stomped with materials->bear merge
2013-09-26 09:23:47 -07:00
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07:00
63757692b6
NORSPEC-362 Fix leak of deferred color attachments
2013-09-11 20:40:11 -07:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
e8bd9afbe6
Merge viewer-release 3.6.5 Cocoa
2013-09-09 13:10:45 -07:00
e7ac4695e3
Merge viewer-release
2013-09-09 12:59:17 -07:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
70cacc4d17
merge changes for 3.6.3-release
2013-08-19 15:51:40 -04:00
3f186aab77
Merge in viewer-release
2013-08-19 12:10:40 -07:00
80256fdbf5
NORSPEC-349 make render targets use original formats when resizing impostors and fix alpha for deferred impostor shader
2013-08-15 10:07:41 -07:00
dc63061714
NORSPEC-352 for non-ALM rendering, make lighting shader with alpha masking obey vertex alpha
2013-08-15 09:37:54 -07:00
93b3f1297e
MAINT-3338 fix disable of particle glow on false suspicion of lying network data
2013-10-21 13:20:34 -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
3a8ad62d9b
Merge with latest viewer-release.
2013-07-11 19:46:20 -04:00
bd41392b7e
Merge with viewer-bear which was just merged with viewer-release
2013-06-28 13:36:41 -07:00
b6b4b59138
Merge with viewer-release
2013-06-27 18:03:47 -07:00
c07f47dee8
NORSPEC-259 nerfed copyContentsToFramebuffer handling of non-FBO sources
2013-06-24 19:28:02 -07:00
45b1466de6
Review cleanup
2013-06-18 19:51:02 -05:00
ccd04cd66c
Occlusion culling overhaul.
2013-06-18 17:24:21 -05:00
3779e51bfc
Merged with https://bitbucket.org/lindenlab/viewer-beta
2013-05-13 22:22:51 -04:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
066f2acadf
Forgot to commit @#! merge
2013-04-11 16:23:36 -07:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
c7bab8ab8b
Merge
2013-04-11 16:04:21 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
98e02a5d76
Merge new boost and add OS X 10.8 mods
2013-02-22 09:49:58 -08:00
2fd0e6e8f9
Merge viewer-cat and resolve conflict with alternate self
2013-02-21 16:50:04 -08:00
615af0c556
MAINT-2150 Fix for super-large ( > 4096 ) snapshots having black borders
2012-12-18 16:39:48 -06:00
0302573348
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
2012-12-11 16:38:10 -05:00
e0432f98ee
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
2012-11-28 16:36:34 -05:00
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
49caededb4
BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa
2012-09-19 17:05:56 +00:00
cb96ab1a6f
MAINT-628 Fix for seams in high res snapshots when lighting and shadows is enabled.
2012-07-18 15:49:47 -05:00
cfc5236e64
MAINT-628 Fix for seams in high res snapshots when lighting and shadows is enabled.
2012-07-18 15:49:47 -05:00
2eedd0c3c0
Merge with tip
2012-06-15 13:00:49 -07:00
b93a23aa82
MAINT-1147 Fix for frame stall on region crossing.
2012-06-13 18:05:56 -05:00
86e84ae75e
Crashfix; handle errors in release builds more gracefully.
2012-09-01 15:24:54 +02:00
e3a5125b41
MAINT-616 Potential fix for corrupted mip maps.
2012-05-25 17:58:12 -05:00
efda0814cb
MAINT-616 Fix for corrupted mipmaps. Cleanup based on code review feedback.
2012-05-24 10:50:48 -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
f53fa08c70
MAINT-708 Use texture compression to minimize memory bloat (experimental)
2012-03-02 13:35:10 -06:00
f9f247c5a6
SH-2084 Don't error out on framebuffer mismatch -- probably causing a crash when some post-snapshot or minimize/restore operation gets out of phase.
2011-12-07 16:36:26 -06:00
c4aa8c50da
SH-2447, SH-2525, SH-2276 Strip out defunct global illumination code, add accounting for how much memory is taken up by LLRenderTarget, fix crash on login in bindGLIndices (work around driver bug that doesn't respect VAO state WRT to index buffers), remove some unused render targets, remove some unused shaders, make it possible to run a fullscreen session
2011-10-04 02:31:54 -05:00
ac37656aa5
SH-2276 Fix for failed assertions reported from debug-enabled viewers. Also, remove "Basic Shaders" as a user settable option (shaders are always on if GL version >= 2.0, always off otherwise)
2011-10-02 02:12:21 -05:00
f558d86578
SH-2244 Don't use multisample texture (ever), and don't use GL_DEPTH_COMPONENT32 (use GL_DEPTH_COMPONENT24)
2011-09-30 01:11:26 -05:00
26568d5c98
SH-1838 Add error handling for allocation of off screen render targets.
...
Reviewed by Leslie
2011-07-20 16:06:04 -05:00
44f0a1b681
SH-1778 Physics shape display fix up.
2011-06-11 16:51:01 -05:00
ffab1eef57
Mac build fixes.
...
Reviewed by davep.
2011-06-03 16:24:07 -07:00
9eea451a82
SH-469 Don't use depth buffers and multisample buffers where not absolutely needed -- make sample counts consistent between shaders and render targets.
2011-05-25 15:51:15 -05:00
4353eeb928
SH-469 GL_ARB_texture_multisample support
2011-05-24 15:29:33 -05:00
fd574e3485
merge
2011-05-19 20:42:56 -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
19a06478d9
SH-1618 FIX -- Lighting and shadows crash ATI macs
...
* Fixed ATI mac "lighting and shadows" related crash
* Fixed up numerous GL errors on macs related to multiple color formats,
the use of glEnable/glDisable on textures above the texture unit count
and old ATI-specific code that was not appropriate for Mac.
* Disabled SSAO for ATI macs due to it not working with shadows
* Ongoing work to properly get shadows and SSAO functioning on ATI macs is required.
Reviewed by davep
2011-05-19 17:28:23 -07:00
48b107ac97
Apparently the new standard is to NOT suffix ARB extension function pointers with ARB.
2010-12-03 02:37:14 -06:00
0be7fcf2a9
SH-373 Update glext.h, disable anti-aliasing on ATI when rendering deferred. Get rid of RenderUseFBO debug setting (only use FBO when rendering deferred). Use GL_ARB_framebuffer_objects instead of GL_EXT_...
2010-12-02 21:33:03 -06:00
798ba26952
More aggressive management of FBOs. Allocate as few FBOs as possible, assert when FBOs are destroyed out of order.
2010-10-28 17:39:45 -05:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
d43aef498b
Enable FBO on OSX
2010-09-28 14:43:52 -05:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
d3d59f6b14
Backed out changeset: ec7f6f4bd908
2009-11-24 17:51:50 -06:00
854e2eaf9a
added viewports to LLRenderTarget to speed up animation of sidetray
...
reviewed by Leyla
2009-11-11 12:01:17 -08:00
b5724bc0e9
SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This
...
fixes all of the parentheses warnings in the code.
Original patch was reviewed by merov (and others).
2009-09-25 16:51:25 +00:00
536e38ad51
Merging render-pipeline-6-qa-2 into viewer-2
...
Self reviewed.
2009-09-22 11:11:45 +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
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
Dave Parks