Dave Parks
|
79029149a4
|
Automated merge with file:///F:%5Cviewer-bear
|
2013-06-21 12:51:29 -05:00 |
Graham Linden
|
0a61606b79
|
NORSPEC-251 fix issues with binding unloaded standard bumpmaps
|
2013-06-14 14:39:18 -07: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 |
Graham Madarasz
|
7c72222823
|
NORSPEC-158 fix issues with loading of bumpmaps on clean install
|
2013-05-30 17:43:14 -07: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
|
ee2fce8790
|
Merge downstream code and viewer-beta
|
2013-05-09 14:10:45 -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 |
simon
|
b42b789723
|
Merge in downstream code (chui fixes, materials)
|
2013-04-11 16:18:34 -07:00 |
Graham Madarasz (Graham Linden)
|
7c242dae73
|
Fix Mac startup crash on unbind cube map if RenderDebugGL is on
|
2013-04-01 13:27:25 -07:00 |
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
Graham Madarasz (Graham)
|
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 |
Graham Madarasz (Graham)
|
df08808640
|
Improve perf of GLSL uniform lookups by name
|
2013-02-28 09:33:41 -08:00 |
Graham Madarasz (Graham Linden)
|
34158130b4
|
Help the hg stop worrying about comment-only diffs
|
2013-02-21 16:54:36 -08:00 |
Graham Madarasz (Graham Linden)
|
2fd0e6e8f9
|
Merge viewer-cat and resolve conflict with alternate self
|
2013-02-21 16:50:04 -08:00 |
Graham Madarasz (Graham Linden)
|
eb41cf7f76
|
For MAINT-755 Fix for unbinding cubemap causing false alarm in tex type checking code (OS X RenderDebugGL crash) Code review: Dav3p
|
2013-02-21 16:26:16 -08:00 |
Graham Madarasz (Graham Linden)
|
e2f3ea50d5
|
For MAINT-1291 Re-order cubemap disable and shader tex disable to avoid false alarm when using RenderDebugGL. Code Review: DaveP
|
2013-02-14 10:57:28 -08:00 |
Nyx Linden
|
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 |
Don Kjer
|
1f6e20c5bb
|
Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture
|
2012-09-04 17:43:08 +00:00 |
Richard Linden
|
93578f7e51
|
Automated merge with http://bitbucket.org/lindenlab/viewer-cat
|
2012-08-24 16:31:29 -07:00 |
Richard Linden
|
a98c7e150b
|
llfasttimer cleanup
removed unnecessary cache miss from fast timers
renamed llfasttimer_class back to llfasttimer
|
2012-08-06 16:08:04 -07:00 |
Dave Parks
|
096fe03786
|
MAINT-646 Faster traversal of render batch lists.
|
2012-06-01 14:27:04 -05:00 |
Dave Parks
|
f53fa08c70
|
MAINT-708 Use texture compression to minimize memory bloat (experimental)
|
2012-03-02 13:35:10 -06:00 |
Dave Parks
|
2b2a03b3c5
|
SH-2511 Fix for bumpmapped objects flickering.
|
2011-12-12 17:12:47 -06:00 |
Dave Parks
|
428b74f14b
|
SH-2652 Fix for black bands in high-res normal maps (break normal map generation up into tiles to handle the case where a normal map is higher resolution than the current window)
|
2011-11-08 13:11:29 -06:00 |
Dave Parks
|
dfe75ba0eb
|
SH-2610 Fix for black terrain when bump map is visible and shaders are not supported.
|
2011-10-24 12:35:53 -05:00 |
Dave Parks
|
ae31a6f4a7
|
SH-2240 GL 1.2 compatibility pass
|
2011-10-20 15:14:16 -05:00 |
Dave Parks
|
4e894bfa31
|
SH-2600 Fix for busted texture animation on bump mapped objects.
|
2011-10-20 14:33:36 -05:00 |
Dave Parks
|
967479f903
|
SH-2031 Fix for stall in image update -- don't use the CPU to convert a height map into a normal map -- use the GPU instead via a shader. Also, WTF glFinish?
|
2011-10-05 15:12:02 -05:00 |
Dave Parks
|
7c95af74f1
|
SH-2243 work in progress -- application side matrix stack management
|
2011-09-14 16:30:45 -05:00 |
Dave Parks
|
233e42b331
|
merge
|
2011-08-19 16:34:34 -05:00 |
Xiaohong Bao
|
c3327eba03
|
fix for SH-1069: [REGRESSION] Sometimes bumpmaps load only partially
|
2011-08-17 15:33:18 -06:00 |
Xiaohong Bao
|
b5f1ee3878
|
fix for SH-2023: Brightness Bump maps don't load when shadows are enabled
|
2011-08-16 17:00:12 -06:00 |
Dave Parks
|
b9439ac006
|
merge
|
2011-08-08 15:30:34 -05:00 |
Dave Parks
|
14f6bbadef
|
SH-2242 Work in progress migrating to glVertexAttrib everywhere
|
2011-08-08 15:29:23 -05:00 |
Xiaohong Bao
|
f3130b85e6
|
fix for SH-2023: Brightness Bump maps don't load when shadows are enabled
|
2011-07-28 17:51:00 -06:00 |
Dave Parks
|
6469f1c2f2
|
SH-2031 High risk changeset, but potentially high reward. Addresses frame stalls in renderer by never using the fixed function pipeline if shaders are available.
|
2011-07-17 00:24:08 -05:00 |
Dave Parks
|
9b1c284d4c
|
SH-1678 Fix for busted fullbright shiny.
|
2011-06-08 01:08:09 -05:00 |
Dave Parks
|
690f18c948
|
merge
|
2011-06-07 13:59:40 -05:00 |
Xiaohong Bao
|
b100f1d2d4
|
fix for STORM-1298: Crash on startup of Second Life 2.7.1(231307)
|
2011-06-01 12:09:40 -06:00 |
Dave Parks
|
eca17c8993
|
SH-1682 Full integration if indexed texture rendering to improve batch size.
|
2011-05-30 01:25:55 -05:00 |
Dave Parks
|
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 |
Oz Linden
|
ecafe4d8ab
|
fix more DOS line endings
|
2011-05-20 17:19:03 -04:00 |
Dave Parks
|
93696ac019
|
merge
|
2011-05-12 17:39:08 -05:00 |
Xiaohong Bao
|
e32d1cf756
|
fix for STORM-973: [crashhunters] crash at LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *)
|
2011-04-05 15:28:18 -06:00 |
Dave Parks
|
ec11823c77
|
SH-1069 Fix for some bump maps not loading fully.
(transplanted from 1a03c3745cbbe47e5cc5dfec3a9114516865ddc0)
|
2011-03-04 18:46:26 -06:00 |
Dave Parks
|
a034ffd4b1
|
Remove unneeded assertion.
|
2011-03-21 17:30:26 -05:00 |
Dave Parks
|
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 |
Dave Parks
|
78cc321127
|
SH-1069 Fix for some bump maps not loading fully.
|
2011-03-04 18:46:26 -06:00 |
Dave Parks
|
32c4a448b1
|
SH-571 Fix for shadows disappearing for a frame whenever an object switches octree nodes. Regressed EXT-7155 so fix for regression included.
|
2011-01-19 23:16:53 -06:00 |