Andros Baphomet fe0a761ce6 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	indra/newview/app_settings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl
	indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl
	indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
	indra/newview/app_settings/shaders/class1/deferred/giF.glsl
	indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
	indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
	indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
	indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
	indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedF.glsl
	indra/newview/app_settings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl
	indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
	indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl

2013-11-03 12:17:50 -05:00

..

CMakeLists.txt

Some minor llfont cleanup..more to come

2013-03-07 01:41:42 -05:00

llcubemap.cpp

MAINT-2968 disable client GL namegen, go spec

2013-10-13 17:07:45 +02:00

llcubemap.h

Renderer update. Incl mac fixes, DoF improvements, windlight floater code cleanup. (shining-fixes merge)

2012-02-09 14:26:21 -06:00

llfontbitmapcache.cpp

A few nullchecks, and removal of pointless uint < 0 bounds checks.

2012-09-02 08:48:52 +02:00

llfontbitmapcache.h

V2 llrender merge, sans freetype and LLTexture

2011-02-24 18:08:17 -06:00

llfontfreetype.cpp

Some minor llfont cleanup..more to come

2013-03-07 01:41:42 -05:00

llfontfreetype.h

Warning fixfix~

2013-03-08 14:51:17 -05:00

llfontgl.cpp

UI cleanup.

2013-04-16 00:25:59 -05:00

llfontgl.h

Some minor llfont cleanup..more to come

2013-03-07 01:41:42 -05:00

llfontregistry.cpp

Some minor llfont cleanup..more to come

2013-03-07 01:41:42 -05:00

llfontregistry.h

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llgl.cpp

Add LLGLManager::mIsMobileGF

2013-11-02 03:33:21 -05:00

llgl.h

Add LLGLManager::mIsMobileGF

2013-11-02 03:33:21 -05:00

llgldbg.cpp

Imported existing code

2010-04-02 02:48:44 -03:00

llgldbg.h

Imported existing code

2010-04-02 02:48:44 -03:00

llglheaders.h

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llglslshader.cpp

Mats.

2013-11-02 01:20:05 -05:00

llglslshader.h

Use LLStaticHashedString for faster uniform lookup.

2013-10-26 16:26:46 -05:00

llglstates.h

Disable AA when drawing ui.

2013-04-15 18:09:00 -05:00

llgltexture.cpp

Added an experimental new alphamask detection method(set SHUseRMSEAutoMask to TRUE to use. Adjust SHAlphaMaskMaxRMSE to tweak cutoff). Fixed per-frame sky updates hammering analyzeAlpha.

2013-04-06 02:04:46 -05:00

llgltexture.h

Added an experimental new alphamask detection method(set SHUseRMSEAutoMask to TRUE to use. Adjust SHAlphaMaskMaxRMSE to tweak cutoff). Fixed per-frame sky updates hammering analyzeAlpha.

2013-04-06 02:04:46 -05:00

llgltypes.h

RLVa impl updated to that used in v3. Hooked RLVa restrictions back into wearables. New RLVa floater: 'Locks...' Also updated 'Restrictions...' floater.

2012-04-12 10:29:45 -05:00

llimagegl.cpp

Added handling of GL_LUMINANCE pixel format to setManualImage. Was missing, although GL_LUMINANCE_ALPHA and GL_ALPHA were handled.

2013-10-26 16:42:41 -05:00

llimagegl.h

MAINT-2968 disable client GL namegen, go spec

2013-10-13 17:07:45 +02:00

llpostprocess.cpp

Try and squelch some warnings regarding nightvision post shader on amd gpus.

2013-10-26 16:36:38 -05:00

llpostprocess.h

Try and squelch some warnings regarding nightvision post shader on amd gpus.

2013-10-26 16:36:38 -05:00

llrender2dutils.cpp

Merge branch 'UICleanup' of git://github.com/Shyotl/SingularityViewer

2013-05-27 08:09:28 -04:00

llrender2dutils.h

Finished LLGLTexture. Migrated opengl related code from llui.h/cpp to llrender2dutils.h/cpp. Moved lluiimage to llrender library.

2013-01-07 20:12:14 -06:00

llrender.cpp

Mats.

2013-11-02 01:20:05 -05:00

llrender.h

Mats.

2013-11-02 01:20:05 -05:00

llrendersphere.cpp

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

llrendersphere.h

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

llrendertarget.cpp

Let the rendertarget dictate internal format when resizing.

2013-10-26 18:09:34 -05:00

llrendertarget.h

Let the rendertarget dictate internal format when resizing.

2013-10-26 18:09:34 -05:00

llshadermgr.cpp

Merge remote-tracking branch 'upstream/master'

2013-11-03 12:17:50 -05:00

llshadermgr.h

Mats.

2013-11-02 01:20:05 -05:00

lltexture.cpp

Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.

2011-03-31 03:22:01 -05:00

lltexture.h

Migrated LLTexLayerParams. Renamed LLTexLayerSet(Buffer) to LLViewerTexLayerSet(Buffer), and provided simple bases in llappearance/lltexlayer.h to mimic new usage. Reworked various bits to work with these changes, and performed some basic cleanup of LLVOAvatar(Self)

2012-12-24 17:20:46 -06:00

lluiimage.cpp

Finished LLGLTexture. Migrated opengl related code from llui.h/cpp to llrender2dutils.h/cpp. Moved lluiimage to llrender library.

2013-01-07 20:12:14 -06:00

lluiimage.h

Finished LLGLTexture. Migrated opengl related code from llui.h/cpp to llrender2dutils.h/cpp. Moved lluiimage to llrender library.

2013-01-07 20:12:14 -06:00

llvertexbuffer.cpp

Mats.

2013-11-02 01:20:05 -05:00

llvertexbuffer.h

Mats.

2013-11-02 01:20:05 -05:00