6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
7b2cc02863
Merge LL fitted mesh
2014-02-06 00:41:33 -08:00
ff8b002c3b
Quite down log spam from loading shaders.
...
Up bone cap to 64 for rigged meshes.
2013-10-10 13:56:06 -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
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -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
f86a7c04d3
NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac 10.6.8 nV driver issues
2013-07-30 11:33:58 -07:00
f357269c38
NORSPEC-325 WIP restore gamma (uncorrected) attenuation and unify sRGB conversion in one place
2013-07-25 09:36:13 -07:00
d6d2f74fbb
NORSPEC-290 Shader optimization WIP -- compatibility pass with OpenGL 3.3, slight cleanup.
2013-07-01 16:27:20 -05:00
d262ca32d3
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-07-01 10:59:46 -05:00
bd41392b7e
Merge with viewer-bear which was just merged with viewer-release
2013-06-28 13:36:41 -07:00
380785e613
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-27 16:16:56 -05:00
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
ccd04cd66c
Occlusion culling overhaul.
2013-06-18 17:24:21 -05:00
473474b949
Revert changes for MAINT-2616 due to licensing issues, need a full patch
...
submitted to be acceptable
2013-05-22 16:51:42 -07:00
abdbf45aaa
MAINT-2616 : Updated my Intel driver and now have orange in buttons and
...
Inventory pull down bar causing blinks to screen. Pulled in FS code,
Reviewed by Kelly
2013-05-20 11:18:12 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
1688e995eb
Provide LLGLSLShader backwards compat so as not to break the appearance utility
2013-04-26 09:11:52 -07:00
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
b2344cfd13
Fix rendering artifacts on Mac Mobile GeForce cards
2013-04-20 03:36:21 -07:00
f964e51fc9
Fix for mac build
2013-04-15 15:31:57 -05:00
8025b8b2bc
NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where available
2013-04-15 13:16:14 -05:00
679a095aa0
NORSPEC-74 Fix for assert when Debug GL enabled when rendering materials.
2013-04-02 15:45:17 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
df08808640
Improve perf of GLSL uniform lookups by name
2013-02-28 09:33:41 -08:00
2ae4b6976b
Added a new draw pool specifically for faces with materials applied to them. Removed materials rendering from the bump draw pool, and reverted it to its previous state.
2013-02-04 11:32:05 -05:00
e551fc5137
Merge LGPL
2013-09-29 20:35:40 -07:00
9810792665
Back out Intel HD 4000 fixes to thoroughly test the latest driver with OGL 4.2 support
...
This driver seems to have fixed the rendering issues.
2013-09-29 16:14:57 -07:00
119ce81029
Merge viewer bear updates + merge fixes
2013-09-23 22:10:59 -07:00
0c314a0e6f
Merge LGPL
2013-09-21 16:59:50 -07:00
05ad3a1c29
Merge Viewer-bear (merge of materials + fixes) to FS-exp
2013-09-21 11:44:46 -07:00
5519c39beb
Merge Viewer-bear (Materials 3.6.6 RC)
2013-09-16 16:18:33 -07:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
cec54eddb1
Build fix for 64-bit. Should work on 32-bit builds too.
2013-07-11 11:44:25 -05:00
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
e606677ed8
Added the ability to remove a preprocessor define.
2012-08-29 04:56:54 -04:00
99371f892e
Added new bindTexture and unbindTexture API to LLGLSLShader. Reviewed by davep.
2012-08-28 14:44:28 -04:00
ed1b78e322
Added support for adding custom preprocessor definitions (for shader permutations)
2012-08-28 10:33:32 -04:00
70b77b3dea
FIRE-6855; Rainbow UI for Intel HD (4000) graphics chips. Use a special shader for Intel which does not pass colors as vertex attributes, but an uniform.
2013-01-03 05:03:46 +01:00
67221663fe
MAINT-616 Fix for mac build.
2012-05-30 14:55:34 -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
3267b42ee5
SH-2908 Temporary fix for mac build
2012-02-13 18:26:48 -06:00
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
e0582d4bc7
Fix for Debug GL generating errors when changing graphics preferences (reloading shaders).
2012-02-08 19:01:08 -06:00
71a660e006
* Fixed up shader compilation errors to get lighting and shadows working again on Mac.
...
* Cleaned up vertex buffer allocation to guarantee allocation and deallocation using the same allocation methods from the same pools.
* Added new shader feature for atmospheric helpers in the absence of lighting.
Reviewed by davep.
2012-01-26 10:17:41 -08:00
9fa68f0da3
SH-2743 Fix for shader compiler error on some GL 3.x implementations.
2011-12-14 17:55:36 -06:00
2179e1c1f2
SH-2541 Fix for speckles on avatar on some cards -- don't use "maximum_alpha" for alpha tests in shaders as it was always being set to 1.0 anyway.
2011-11-02 13:13:38 -05:00
Tank_Master