Richard Linden
5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
Dave Parks
ff8b002c3b
Quite down log spam from loading shaders.
...
Up bone cap to 64 for rigged meshes.
2013-10-10 13:56:06 -05:00
Richard Linden
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
Richard Linden
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
Graham Linden
95e34d86b9
The unbearable lightness of being norspec
2013-09-18 18:24:16 -07:00
Richard Linden
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Graham Madarasz (Graham Linden)
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
Graham Madarasz (Graham Linden)
b44e7303d8
NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on Mac
2013-07-29 18:59:45 -07:00
Graham Linden
f357269c38
NORSPEC-325 WIP restore gamma (uncorrected) attenuation and unify sRGB conversion in one place
2013-07-25 09:36:13 -07:00
Graham Linden
e290dd3fa1
NORSPEC-311 make post deferred (alpha objects) respect same gamma ramp as deferred (opaque objects)
2013-07-24 04:03:27 -07:00
Dave Parks
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
Dave Parks
c3f14b915c
NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric)
2013-06-03 12:50:48 -05:00
Dave Parks
743d1a777e
NORSPEC-198, NORSPEC-176, NORSPEC-106, NORSPEC-202 et al -- Material matrix testing based overhaul WIP
...
Reviewed by Graham
2013-05-29 18:48:09 -05:00
Dave Parks
933d4c40f4
NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny descrepencies.
2013-05-23 12:47:52 -05:00
simon
b864cecd6c
De-bork the viewer merge, causing black in-world images. Reviewed by Kelly
2013-05-13 16:34:52 -07:00
simon
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
Graham Madarasz
025c890958
Merge vwr-dev-mat
2013-05-01 08:11:15 -07:00
Graham Madarasz
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
Graham Madarasz
1688e995eb
Provide LLGLSLShader backwards compat so as not to break the appearance utility
2013-04-26 09:11:52 -07:00
Graham Madarasz
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
Geenz
cfc3757778
First pass on alpha blended materials
2013-04-11 14:57:11 -04:00
Graham Madarasz
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
Dave Parks
609ed855e1
MAINT-2371 More optimizations.
...
Reviewed by Graham
2013-03-04 18:01:42 -06:00
Geenz
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
Geenz
aa1befd689
Specular map support. This is the vast majority of the material parameters implemented at this point for opaque geometry.
2013-01-30 12:17:04 -05:00
Geenz
5f03e197f4
Trying to set materials up for rendering! Yay!
2013-01-25 17:54:38 -05:00
Geenz
eda11a25a4
Initial (largely complete) gamma correct rendering implementation.
2013-01-11 06:37:21 -05:00
Jonathan Goodman
d5b45b0b63
Use an unordered map for custom #defines instead of a map. Lookups are faster, and we don't really care about any particular order anyways for these.
2012-08-29 08:02:46 -04:00
Jonathan Goodman
c911efb953
Just pass in an empty preprocessor definition map from now on. The shader compiler won't add new #defines if it's empty.
2012-08-29 03:41:26 -04:00
Jonathan Goodman
ed1b78e322
Added support for adding custom preprocessor definitions (for shader permutations)
2012-08-28 10:33:32 -04:00
Dave Parks
e86b1c18db
MAINT-794 Fix for assert on loading some types of objects before their parents.
2012-07-11 15:17:13 -05:00
Dave Parks
bedbbf7c02
Merge
2012-06-28 16:32:54 -05:00
Dave Parks
28ccf4190e
MAINT-653 Fix for shadow acne at high altitudes
2012-06-22 17:31:46 -05:00
Dave Parks
abaf0155b4
MAINT-616 Faster issuance of occlusion queries.
2012-05-25 10:51:38 -05:00
Adam Moss
9ce481a5ac
STORM-1819: Ternary/graded shadow support
...
Coalesced patchset.
2012-04-21 17:35:50 +01:00
Dave Parks
353907bac6
SH-2908 Fix for incompatibility issue with GLSL 1.30
2012-02-28 16:10:04 -06:00
Dave Parks
8f261582b8
SH-2908 Fix for crash when enabling Lighting and Shadows on some AMD GPUs
2012-02-22 14:30:24 -06:00
Dave Parks
e1a71a97cd
SH-2908 Potential fix for pink textures on some OpenGL 3.1 implementations.
2012-02-21 14:02:09 -06:00
Dave Parks
8d12038ef6
SH-2908 Potential fix for precision complaints from some AMD OpenGL 3.1 implementations.
2012-02-17 15:06:48 -06:00
Dave Parks
76a27f5100
SH-2964 Fix for shader compilation error on some older NVIDIA cards.
2012-02-13 13:55:51 -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
Dave Parks
38e0b7de96
SH-2729 Fix for horizontal line of glitching graphics when DoF enabled
2012-02-06 18:56:19 -06:00
Leslie Linden
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
Dave Parks
9fa68f0da3
SH-2743 Fix for shader compiler error on some GL 3.x implementations.
2011-12-14 17:55:36 -06:00
Dave Parks
2dc7df91ad
SH-2743 Fix for shader compiler error on some GL 3.x implementations.
2011-12-13 15:23:55 -06:00
Leslie Linden
06a2d4eb27
SH-2038 PROGRESS -- Hacked the code to not render alpha using VBO's on OS X since everything renders faster using VBO's except alpha for some mysterious reason.
2011-11-28 17:13:42 -08:00
Dave Parks
5c690db63f
SH-2700 Fix for random black textures due to texture index out of bounds. Also change shader to show bright pink on index out of bounds and add assertions to help prevent this sort of bug in the future.
2011-11-18 15:04:26 -06:00
Dave Parks
bbac7e9aec
SH-2681 Fix for shader compiler error on GLSL 1.30 and later
2011-11-15 13:01:23 -06:00
Dave Parks
df546bfba9
SH-2666 Tweak depth of field optimizations based on resident feedback.
2011-11-10 16:12:50 -06:00
Dave Parks
c8f558f677
SH-2240 Better fix for red moon -- stop special casing "highlight_color" as a parameter.
2011-11-10 11:39:08 -06:00