Siana Gearz
fd22d80dfd
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/app_settings/shaders/class2/effects/gaussBlurF.glsl
indra/newview/llmanipscale.cpp
indra/newview/llmeshrepository.cpp
indra/newview/llviewerregion.cpp
indra/newview/llvovolume.cpp
2011-12-24 20:12:12 +01:00
Shyotl
1bfa72fa7c
V3 merge. Slight update. Fixes lighting oddities.
2011-12-16 01:50:57 -06:00
Shyotl
ffb285c6ff
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
...
-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
2011-12-09 14:02:29 -06:00
TighMacFanatic
f5a08b1c12
Merge branch 'master' of https://github.com/siana/SingularityViewer
2011-12-01 12:13:56 -05:00
Siana Gearz
cd67046b33
Silly way to clear stringstream on GCC
2011-12-01 17:41:50 +01:00
Shyotl
0b5a2cd6a3
Un-break for compilers that don't yet support stringstream copying ala C++0x's MoveConstructible
2011-12-01 02:21:23 -06:00
Shyotl
8e7733b2ce
Lazy shader update. attribute -> ATTRIBUTE, varying -> VARYING. Moved some shader preprocessor stuff from llviewershadermgr.cpp to llshadermgr.cpp to match LL (although it looks more messy)
2011-11-24 01:03:03 -06:00
Shyotl
5d8d402403
Fix shader error dumping. (the error file was not being written to.) Also catch exceptions if shader log dir is inaccessable or otherwise unable to be cleared.
2011-11-23 21:29:42 -06:00
Shyotl
e46c906a8b
Invalid texure indexes now display as pink to better assist debugging.
2011-11-21 15:56:24 -06:00
Shyotl
ee5a9c97be
Removing some shader warnings under gl 3.x context.
2011-11-07 16:43:30 -06:00
Shyotl
3891928092
vary_texture_index only needed in shaders when batching.
2011-10-31 20:44:33 -05:00
Shyotl
b3423de80a
Shaders dumped to logs/shader_dump directory if 'ShyotlDumpRawShaders' is true, or a shader throws an error of some sort.
2011-10-22 01:55:08 -05:00
Shyotl
73f2543a6f
Use LLGLShader::sIndexTextureChannels instead of mNumTextureImageUnits directly.. also check that channel value isn't invalid. Also make super-sure shaders are disabled on pre opengl 2.0 hardware.
2011-10-20 13:37:09 -05:00
Shyotl
f551294e66
Alphamasking migrated to shaders instead of using fixed-function. Very early code. Hasn't even made it into viewer-development yet.
2011-08-12 19:20:11 -05:00
Shyotl
9bda97786f
Batch indexing/no-fixed-function WIP.
2011-08-09 01:11:05 -05:00
Shyotl
b258b71e07
Flipped the MESH_ENABLED switch. Added missing components and updated stuff to be closer to mesh-development head.
2011-07-30 20:30:07 -05:00
Shyotl
71eec1caed
Improved error handling (introduced debugsession commandline argument). Startup/shutdown now more verbose. SSE checks if project was compiled with SSE(2)... not sure if windows would reach it if hardware lacked support, but linux/mac may (from V2). Fixed Mac crashes in deferred.
2011-05-28 01:46:11 -05:00
Shyotl
4663b605ef
Added fullbright shiny underwater shader.
2011-05-18 17:00:44 -05:00
Shyotl
7d3e9723c3
Reduced LL's leakage of program/shader objects, drastically.
...
Re-structured some shader loading/unloading handling.
These changes are pretty experimental. I'll be holding off of tweaking the paramater managers(among other things) until I know if this stuff is working correctly.
2011-02-10 18:21:38 -06:00
Hazim Gazov
7a86d01598
Imported existing code
2010-04-02 02:48:44 -03:00
