d2b253f1f6
Changes to protect against use of normalize3fast on degenerate vectors
2013-06-12 09:16:19 -07:00
eba7eb2d06
NORSPEC-233 fix default value and material apply logic errors
2013-06-08 06:28:48 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
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
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
a37bff8bf1
NORSPEC-103 reflect normal/spec UVs in face edit overlay display
2013-05-14 15:26:43 -07:00
e413f4b335
Fixup merge diffs
2013-05-10 15:13:07 -07:00
a9ede98915
NORSPEC-126 Make objects with normal maps applied obey legacy shiny settings
2013-05-06 08:56:32 -07:00
9187a06d0b
NORSPEC-151 make disabling bumpyshiny disable adv lighting model as well
2013-05-03 09:16:15 -07:00
419a06036b
Merge with vwr-dev-mat
2013-05-03 08:22:50 -07:00
6bb9c2720e
NORSPEC-149 Fix for objects set to alpha blend sometimes getting tossed into alpha mask pool.
2013-05-02 12:35:48 -05:00
ced83c5248
Merge vwr-dev-mat
2013-04-26 13:13:55 -07:00
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
8bf4f15911
NORSPEC-104 Fix for texture animation sometimes not overriding specular and normal map texture coordinates.
2013-04-25 17:15:47 -05:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04: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
78d23e6642
NORSPEC-75 Add appropriate draw calls to underwater render passes so objects with material data don't disappear in water.
2013-04-10 00:27:32 -05:00
14f02e48b8
NORSPEC-66 Hook up material parameters to rigged attachments.
2013-03-29 20:12:27 -05:00
fc4869fb78
NORSPEC-65 Hook up texture offset/scale/rotation for normal and specular maps.
2013-03-29 16:13:36 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
0ddeaa1967
for SH-3927: Interesting: Viewer should send predicted camera position to simulator to control object load order
2013-03-25 18:45:42 -06:00
41ca92c67c
NORSPEC-54 Potential fix for crashing on all sorts of random operations.
2013-03-25 18:27:07 -05:00
35383790fb
Merge pragma warning hack to fix linux build
2013-03-12 04:40:51 -07:00
6613d80d72
Clean up moving llalignedarray and fast memcpy to llcommon
2013-03-11 14:19:05 -07:00
586025bde5
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-03-04 18:06:29 -06:00
609ed855e1
MAINT-2371 More optimizations.
...
Reviewed by Graham
2013-03-04 18:01:42 -06:00
4e81a84abd
Performance improvements. Faster threadsaferefcount, faster instancetracker, use hashtable and pre-hashed strings for GLSL uniform lookup, and use dup_handles curl interface to avoid re-initing ares resolvers expensively.
2013-03-04 08:57:58 -08:00
df08808640
Improve perf of GLSL uniform lookups by name
2013-02-28 09:33:41 -08:00
f5e5396c3a
MAINT-2371 First set of profile guided optimizations.
...
Reviewed by Graham
2013-02-26 15:15:08 -06:00
f67087b872
MAINT-2370 Add debug setting "RenderAutoMuteRenderCostLimit" that automatically visually mutes avatars above a certain threshold (adjusted by Avatar Mesh Detail Slider)
2013-02-20 19:30:46 -06:00
8bb3d0891d
merge up to 3.4.5-release
2013-02-12 13:27:03 -05:00
ee87ef2303
merge downstream code from viewer-lion
2013-01-30 15:25:09 -08:00
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
5f03e197f4
Trying to set materials up for rendering! Yay!
2013-01-25 17:54:38 -05:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
40e78a80cc
Pull and merge viewer-development
2012-12-04 14:31:15 -08: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
d6e3b0445a
Merge in viewer-development code and fix build
2012-10-15 14:23:29 -07:00
c6a2ac0489
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20 19:43:54 -07:00
7fc702dc49
reapply 04fdf7945708: MAINT-775 Fix for particle index pool corruption on teleport.
2012-09-20 10:00:58 -04:00
b5e71964e5
reapply c77cea5c6e41: MAINT-646 Cleanup some warnings from previous changes.
2012-09-20 10:00:56 -04:00
cf98064700
reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctree
2012-09-20 09:48:55 -04:00
d52c1c1c68
Fixing merge conflicts related to restoring DRTVWR-167 changes
2012-09-12 16:37:13 -04:00
a766e26db4
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
2012-09-10 10:37:02 -07:00
38acb45af8
Merge in latest viewer-development
2012-09-05 17:17:54 -07:00
1f6e20c5bb
Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture
2012-09-04 17:43:08 +00:00
58d5e223b8
merge
2012-07-30 15:02:02 -04:00
a5c9d89b28
merge
2012-07-30 14:57:33 -04:00
3803a5b5ae
pull back fixes for 3.3.4-beta4
2012-07-17 13:21:36 -04:00
ccac47c1a7
MAINT-1223 Fix for alpha updates not triggering LoD updates.
2012-07-16 14:31:15 -05:00
509408f393
merge back beta fixes for DRTVWR-180
2012-07-14 09:30:09 -04:00
173d0fa213
Pull in viewer-development because it's painful. Merge with runitai's help.
2012-07-11 16:15:23 -07:00
997b360747
MAINT-794 Fix for assert on loading some types of objects before their parents.
2012-07-11 15:17:13 -05:00
266209b6a3
trivial: convert to Unix line endings.
2012-07-06 14:44:50 -06:00
b7555a3309
Merge back viewer-lion, which has viewer-development and down-stream fixes
2012-08-01 14:07:24 -07:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
e86b1c18db
MAINT-794 Fix for assert on loading some types of objects before their parents.
2012-07-11 15:17:13 -05:00
2c3e78f1f1
merge changes for DRTVWR-167
2012-06-27 14:18:22 -04:00
a1d0d67e05
MAINT-775 Fix for particle index pool corruption on teleport.
2012-06-15 16:07:06 -05:00
93fcff2b24
MAINT-646 Cleanup some warnings from previous changes.
2012-06-14 14:54:54 -05:00
52411f83a1
fix for MAINT-758: [PUBLIC]texture discard level is inconsistent between sessions
2012-06-14 12:01:21 -06:00
92ee373e45
MAINT-646 Factor std::set out of lloctree
2012-06-05 12:55:17 -05:00
542975b4c6
merge
2012-06-04 16:19:18 -04:00
6ee0456220
merge
2012-06-04 15:28:08 -04:00
defbd61d31
MAINT-639 Fix for random rainbow effects on some prims.
2012-05-31 13:25:19 -05:00
fdb0218bfc
Crashfix; Guard against 0 pointer textures.
2012-10-22 15:40:18 -04:00
957bfcd5d9
fo SH-3074: clear ghost and stale texture fetching requests in time.
2012-05-29 18:02:11 -06:00
6fe9b45db2
Fix for linux build.
2012-05-22 00:03:56 -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
fa6add3fcd
merge changes for drtvwr-132
2012-04-03 11:28:56 -04:00
38ad8611c9
MAINT-710: Fix for VertexBufferStrider could not find valid vertex data. (from Firestorm)
2012-03-27 10:55:15 -04:00
423659c680
MAINT-775 Particle vertex buffer management optimizations
2012-05-02 15:45:38 -05:00
0249a0d1e7
Automated merge with http://hg.secondlife.com/viewer-release
2012-04-26 14:07:09 -04: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
635a264e6f
merge
2012-02-08 11:22:52 -05:00
0c1fc78bd9
SH-2794 Map buffer now performs as well as buffersubdata
2012-01-18 12:40:11 -06:00
c0fffdea88
SH-2789 WIP
2012-01-12 16:11:06 -05:00
5546041301
SH-2794 WIP -- work on getting glMapBuffer and friends to behave
2011-12-21 15:55:14 -06:00
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
7b6723d1e0
SH-1650 Mitigate memory fragmentation by holding onto and reusing VBOs
2011-10-13 01:19:45 -05:00
54ba56dbe9
SH-2244 changes to run in a core context on AMD hardware without generating deprecation or performance warnings
2011-09-26 18:31:55 -05:00
b9926e8f57
SH-2244 Better VAO support -- still slower than non-VAO implementation for some reason
2011-09-23 02:29:53 -05:00
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
14f6bbadef
SH-2242 Work in progress migrating to glVertexAttrib everywhere
2011-08-08 15:29:23 -05:00
c337888553
SH-2031 Disable usage of glMapBuffer (again). Despite using MapBufferRange, this is still a source of frame stalls.
2011-07-22 01:07:48 -05:00
76249c58f6
SH-2038 FIX -- [PUBLIC] Severe performance drop on MacBook Pros
...
EXP-997 FIX -- Significant FPS degradation in 2.8.0 Beta on Mac equipped ATI video card
* Disabled VBO's on mac to avoid stalls in renderer
* Placed valid data into the padding between triangles in the vertex buffer to remove uninitialized craziness
* Removed invalid rendering checks causing GL errors in debug mode
Reviewed by davep
2011-07-19 13:31:32 -07:00
e4d0d62e71
Added support for apple flush buffer range
2011-07-09 22:30:30 -07:00
f1443579b3
SH-2038 Potential fix for a myriad of performance problems concering VBO usage.
2011-07-09 02:28:34 -05:00
91fe50ecc7
SH-1802 Fix for disappearing meshes under some circuimstances.
2011-06-09 17:03:53 -05:00
6992dbc1e3
SH-1682 Use GL_ARB_map_buffer_range to mitigate impact of mapping larger vertex buffer objects. Limit number of textures per batch to 6 (prevents frame stalls on NVIDIA).
2011-06-01 23:46:04 -05:00
1fd46831f0
SH-1682 Work in progress on using texture indexes to improve batch size (wow, super fast so far)
2011-05-29 00:40:57 -05:00
3a409e6edc
SH-1603 Replace every occurrence of "WTF" with something more appropriate.
2011-05-25 18:45:21 -05:00
b98a17c825
SH-1443 Fix for fullbright alpha objects not appearing for some combinations of deferred rendering and non deferred automatic alpha mask toggling.
2011-04-28 16:40:06 -05:00
bf3fb25663
SH-1069 Fix for bump maps not loading fully -- don't clear bump image list on toggling deferred rendering, but do make sure a loaded callback exists when bump resolution or desired number of components is lacking. Also, subtract radius of prim from distance to face for virtual size calculations (makes heavily tiled textures on largish spheres fully res when appropriate).
2011-03-21 10:51:28 -05:00
00c861f967
SH-1085 Fix for crash when disabling "mirror" and a face is selected.
2011-03-08 14:14:33 -06:00
162d467b4a
SH-1085 Fix for crash when unchecking "mirror." Basically got LLFace to be paranoid about who gets to touch its LLVertexBuffer members.
...
Reviewed by Nyx.
2011-03-03 16:14:52 -06:00
5bd5d918ca
merge
2011-02-02 19:03:03 -06:00
bb113f75ef
SH-900 Fix for only lowest LoD appearing for objects in neighboring regions.
2011-02-02 19:01:27 -06:00
Graham Madarasz