Tank_Master
|
831e4f443b
|
Merge LL 3.6.3 pass 1
|
2013-08-26 17:09:27 -07:00 |
|
Dave Parks
|
9ea2d90a0d
|
Automated merge with http://bitbucket.org/lindenlab/viewer-release
|
2013-06-20 12:10:26 -05:00 |
|
simon
|
c7f7c4bc4d
|
Merge viewer-beta
|
2013-05-09 13:14:49 -07:00 |
|
Graham Madarasz (Graham)
|
d328bfd96e
|
NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect Mac too
|
2013-05-01 11:56:15 -07:00 |
|
Graham Madarasz
|
fd447189c5
|
Merge 3.5.1 into Materials
|
2013-04-25 21:00:16 -07:00 |
|
Oz Linden
|
ddd5659f81
|
merge changes for DRTVWR-294
|
2013-04-19 10:11:29 -04:00 |
|
Dave Parks
|
8025b8b2bc
|
NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where available
|
2013-04-15 13:16:14 -05:00 |
|
simon
|
066f2acadf
|
Forgot to commit @#! merge
|
2013-04-11 16:23:36 -07:00 |
|
Graham Madarasz
|
893bcf34f7
|
NORSPEC-59 work around nV driver crash when doing deferred rendering on NV 9400M/9600M
|
2013-04-09 12:37:57 -07:00 |
|
Oz Linden
|
2fde4a9ae5
|
merge changes for 3.5.0-beta7
|
2013-04-01 14:24:01 -04:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
graham linden
|
14ddfcdf52
|
Merged lindenlab/viewer-development into default
|
2013-03-28 19:16:48 -07:00 |
|
simon
|
98a82c50d5
|
Pull in downstream CHUI code from viewer-development
|
2013-03-25 11:12:52 -07:00 |
|
prep@lindenlab.com
|
f2948cb1eb
|
Merge with viewer-chui
|
2013-03-20 17:53:51 -05:00 |
|
merov
|
c294c7c474
|
CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on Linux
|
2013-03-16 16:09:50 -07:00 |
|
Don Kjer
|
9150757c81
|
More fixes for gcc-4.6 breakage
|
2013-03-13 21:01:50 +00:00 |
|
Oz Linden
|
8bb3d0891d
|
merge up to 3.4.5-release
|
2013-02-12 13:27:03 -05:00 |
|
Graham Madarasz
|
019c7566fb
|
For MAINT-1291 Code Review: DaveP
|
2013-02-07 09:18:09 -08:00 |
|
Tank_Master
|
718f6fa0ff
|
merge LL 3.6.1
|
2013-07-10 00:23:23 -07:00 |
|
Tank_Master
|
d4640277d0
|
Merge LL 3.5.3 release.
|
2013-07-09 16:24:58 -07:00 |
|
Tank_Master
|
14001c54df
|
Gastly CHUI merge pass 1, don't count on anything to work.
|
2013-06-26 12:14:54 -07:00 |
|
Cinders
|
a85b1d8e5b
|
FIRE-7603: Revert fix for MAINT-804 because FBO's and deferred rendering appear to be working on Intel cards.
|
2013-04-13 17:23:01 -06:00 |
|
Dave Parks
|
615af0c556
|
MAINT-2150 Fix for super-large ( > 4096 ) snapshots having black borders
|
2012-12-18 16:39:48 -06:00 |
|
Geenz
|
9e2e150064
|
Check to see if GL_EXT_texture_sRGB and GL_ARB_framebuffer_sRGB are available.
|
2012-12-07 11:07:41 -05:00 |
|
Tank_Master
|
6207030884
|
Merge FS LGPL tip
|
2013-02-23 17:09:53 -08:00 |
|
Don Kjer
|
c06c35609c
|
Updating linux build to gcc4.6
|
2012-10-11 00:09:04 +00:00 |
|
Don Kjer
|
003020763b
|
Turning on mHasShaderObjects for mesa headless
|
2012-10-04 20:11:33 +00:00 |
|
Don Kjer
|
c9ab9590aa
|
Removing server-related cmake cruft. Fixing libGLU warnings on linux.
|
2012-10-04 03:12:48 +00:00 |
|
Don Kjer
|
3d698286fb
|
Wrapping failing llgl assert in gDebugGL
|
2012-09-25 23:27:15 +00:00 |
|
Don Kjer
|
d3924200b6
|
Removing unused gHeadlessClient code from viewer
|
2012-09-23 03:06:11 +00:00 |
|
Don Kjer
|
2d36f9b98a
|
Fix for missing symbols on windows builds
|
2012-09-22 03:39:32 +00:00 |
|
Nyx Linden
|
49caededb4
|
BUILDFIX: enabling the building of the viewer/appearance backend with headless mesa
|
2012-09-19 17:05:56 +00:00 |
|
Dave Parks
|
4a5ad35793
|
MAINT-570 Remove unused memory tracking system LLMemType
|
2012-07-20 11:42:15 -05:00 |
|
Dave Parks
|
e3a5125b41
|
MAINT-616 Potential fix for corrupted mip maps.
|
2012-05-25 17:58:12 -05:00 |
|
Dave Parks
|
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 |
|
Dave Parks
|
c946408519
|
MAINT-586 Starting logging OpenGL version and shader level to simulator
|
2012-05-11 14:42:29 -05:00 |
|
Dave Parks
|
3efa013ee4
|
MAINT-939 Potential fix for crash when editing objects.
|
2012-04-13 11:55:44 -05:00 |
|
Dave Parks
|
a244cff781
|
MAINT-778, MAINT-793 Fix for crash when enabling Debug GL on Mobile Intel 4 Express. Don't pop up driver update notification if GPU class is < 1
|
2012-03-30 12:17:34 -05:00 |
|
Dave Parks
|
76634dc7af
|
MAINT-793 Pop up notification when drivers are likely out of date. Allow Lighting and Shadows on Intel when drivers are up to date.
|
2012-03-28 00:49:42 -05:00 |
|
Dave Parks
|
ce0f455b7c
|
MAINT-806 Fix for some shaders failing to link on ATI x800.
|
2012-03-26 13:09:09 -05:00 |
|
Dave Parks
|
0af7b7038f
|
MAINT-804, MAINT-810 Disable framebuffer object usage on intel chips (implicitly disables lighting and shadows)
|
2012-03-21 16:05:57 -05:00 |
|
Dave Parks
|
83e69659e2
|
MAINT-708 Add checkbox to hardware settings for controlling texture compression. Default texture compression to on for cards with 512MB of VRAM or less, off otherwise.
|
2012-03-08 15:22:56 -06:00 |
|
Dave Parks
|
cd468364a7
|
MAINT-708 Don't compress UI textures. Use GL_NICEST as compression hint to avoid artifacts.
|
2012-03-07 17:26:43 -06:00 |
|
Dave Parks
|
f53fa08c70
|
MAINT-708 Use texture compression to minimize memory bloat (experimental)
|
2012-03-02 13:35:10 -06:00 |
|
Dave Parks
|
64c89ee2c5
|
SH-2908 Fix for mac build
|
2012-02-13 15:41:21 -06:00 |
|
Dave Parks
|
80505ddf68
|
SH-2908 Fix for linux build.
|
2012-02-13 15:02:07 -06:00 |
|
Dave Parks
|
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 |
|
Leslie Linden
|
6343c769ce
|
SH-1865 FIX -- removed some old non-deferred rendering code that was preventing anti-aliasing from working when GL_ARB_texture_multisample is unsupported
|
2011-11-16 10:00:41 -08:00 |
|
Dave Parks
|
da1898d1cb
|
SH-2625 Fix for window size reverting to non-maximized whenever shaders are loaded.
|
2011-10-26 11:19:04 -05:00 |
|
Dave Parks
|
7dafa1be79
|
SH-2622 Put back "Basic Shaders" toggle ability.
|
2011-10-25 15:07:57 -05:00 |