6b85705951
fixing DRTVWR-559 glext usage on mac by upgrading to use khronos distributed glext.h
2022-06-23 22:53:36 -07:00
31e2fa5e50
SL-17600 WIP -- Proper radiance maps (not just mipped cubemaps).
2022-06-21 22:44:30 -05:00
2dc376aa53
SL-17214 add 3p-tinygltf dependency to autobuild.xml
2022-06-08 13:33:59 -06:00
6c6d9a10f8
SL-17287 Update Tracy to 0.8.1. Clean up GPU instrumentation.
2022-05-20 13:31:18 -05:00
c0adc5e181
SL-17376 Fix viewer failing due to missing vcruntime140_1
2022-05-09 21:22:22 +03:00
f3add82a4c
Merge branch master (D550) into DRTVWR-546
...
# Conflicts:
# indra/newview/llappviewer.h
2022-05-04 20:10:29 +03:00
89ab1e4525
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
2022-03-07 00:19:11 -08:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
0f9d4dddf0
DRTVWR-550 unbreak debug build linking on DARWIN. -d suffux libs havent existed for a while
2022-01-14 22:56:54 -08:00
38e77cb958
SL-16614 Viewer's uploader crash with RenderGLCoreProfile
2022-01-12 20:01:36 +02:00
83b4ea59fc
Merge branch 'SL-15742' into DRTVWR-527-maint
2021-12-16 00:58:44 +02:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
f729cfc33f
SL-15742: Convert build scripts to Python 3
...
This changeset makes it possible to build the Second Life viewer using
Python 3. It is designed to be used with an equivalent Autobuild branch
so that a developer can compile without needing Python 2 on their
machine.
Breaking change: Python 2 support ending
Rather than supporting two versions of Python, including one that was
discontinued at the beginning of the year, this branch focuses on
pouring future effort into Python 3 only. As a result, scripts do not
need to be backwards compatible. This means that build environments,
be they on personal computers and on build agents, need to have a
compatible interpreter.
Notes
- SLVersionChecker will still use Python 2 on macOS
- Fixed the message template url used by template_verifier.py
2021-12-10 14:42:49 -08:00
27e4e245d9
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
2021-11-29 20:33:13 +02:00
4745aab376
DRTVWR-546 exterminate tab char from 00-Common.cmake (fails Mac build)
2021-11-16 12:17:36 -07:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
5ccdcf51a3
Merge branch master (DRTVWR-545) into DRTVWR-542-meshopt
2021-11-16 02:22:54 +02:00
ab4d4a4817
Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2021-11-16 01:24:03 +02:00
0505c6ebbb
Merge branch 'master' into DRTVWR-534
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2021-11-16 01:21:55 +02:00
0bffd3d365
Merge branch 'master' into DRTVWR-519
...
# Conflicts:
# README.md
2021-11-16 01:21:05 +02:00
aeed774ff9
(Moved from DRTVWR-528) clean up cmake recursive CXX_FLAGS definition (/Zo)
2021-11-12 15:43:51 -07:00
33f52ee51d
SL-14403 Removed glod
2021-11-10 17:48:55 +02: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
3c2ccd879c
Merge with master after latest Viewer release
2021-10-13 16:54:08 -07:00
6b2e40157b
Merge branch 'master' v6.4.24 into DRTVWR-546
2021-10-13 16:41:24 -06:00
20e05a5c11
Merge branch master (DRTVWR-520) into DRTVWR-542-meshopt
2021-10-14 01:01:09 +03:00
8a1bc1b9e2
Merge with head of Master after a new Viewer release
2021-10-13 14:47:06 -07:00
fb170ffe21
Merge branch 'master' into DRTVWR-545-maint-mix
2021-10-14 00:35:08 +03:00
adcd08fbf4
Revert "Merge branch 'c++17' into DRTVWR-522-maint"
...
This reverts commit 203ea3a70a8e3f077886
2021-09-28 19:22:18 +03:00
b4bb74c5de
SL-16031 Add support for VS 2019 (requires autobuild 1.2-alpha)
2021-09-22 21:37:01 +00:00
c37cc7c3a4
SL-15709: Windows: Include Tracy source directly; don't use a library
2021-09-03 17:20:22 -07:00
b18f328c08
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
2021-09-03 00:18:26 +03:00
3176136686
SL-15709: Fix LLCommon not setting Tracy include directory and not linking to tracy.lib
2021-08-31 21:41:03 -07:00
240000c01c
SL-15709: Use standardized autobuild name; set TRACY_INCLUDE_DIR if Tracy not enabled
2021-08-31 21:23:10 -07:00
203ea3a70a
Merge branch 'c++17' into DRTVWR-522-maint
2021-08-27 19:24:05 +03:00
bb601196dd
SL-15709: IF Tracy is enabled default to using only Tracy instead of Fast Timers; also print Tracy include directory
2021-08-26 22:52:07 -07:00
574b05531c
SL-15709: Default Tracy to off
2021-08-26 22:50:08 -07:00
0c89e67eb5
DRTVWR-534: Batch of modifications to 360 capture project after moving from internal repo to public one.
2021-08-20 08:28:48 -07:00
97f09de4fc
Merge branch 'master' into DRTVWR-520-apple-notarization
...
# Conflicts:
# autobuild.xml
# build.sh
# indra/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewermacosx.cpp
# indra/newview/llappviewerwin32.h
# indra/newview/viewer_manifest.py
# indra/win_crash_logger/llcrashloggerwindows.cpp
2021-08-12 23:13:12 +03:00
7d5cd52498
SL-15709: Add Tracy support to viewer
2021-07-28 15:36:10 -07:00
1a782ed690
SL-15595 update viewer autobuild to import tracy lib
2021-07-27 17:46:29 -06:00
6c8e6f033b
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
2021-07-20 02:48:05 +03:00
b8d846f0ed
Merge master (DRTVWR-516) into DRTVWR-542-meshopt
2021-07-20 00:58:09 +03:00
8631a7a077
Merge with tip of Master after a Viewer release
2021-07-19 14:35:44 -07:00
eb13133e3e
DRTVWR-542 WIP #5
2021-07-12 16:50:10 +03:00
1a17e19a61
DRTVWR-542 WIP #2
2021-07-08 21:14:13 +03:00
97c954dd84
SL-15522 Initial addition of meshoptimizer
2021-07-07 00:42:31 +03:00
abf8c4b364
SL-10297 windows local build fix
...
win_crash_logger will be fully removed in D520, for now just fixing local relwithdebinfo build
2021-06-24 18:37:22 +03:00
b91561e982
SL-15211 Update OpenSSL library
2021-05-27 12:56:35 +03:00
060194a9f8
SL-10297: Need VS switch /std:c++17 to use std::string_view.
...
(cherry picked from commit 28deadab5b
2021-05-13 11:40:05 -04:00
Brad Kittenbrink