1 files changed, 208 insertions, 61 deletions

diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index e7db166..0406520 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -220,6 +220,7 @@ void display_update_camera();
 
 S32             LLPipeline::sCompiles = 0;
 
+BOOL    LLPipeline::sPickAvatar = TRUE;
 BOOL    LLPipeline::sDynamicLOD = TRUE;
 BOOL    LLPipeline::sShowHUDAttachments = TRUE;
 BOOL    LLPipeline::sRenderPhysicalBeacons = TRUE;
@@ -330,8 +331,15 @@ void LLPipeline::init()
         mRenderDebugFeatureMask = 0xffffffff; // All debugging features on
         mRenderDebugMask = 0;   // All debug starts off
 
+        // Don't turn on ground when this is set
+        // Mac Books with intel 950s need this
+        if(!gSavedSettings.getBOOL("RenderGround"))
+        {
+                toggleRenderType(RENDER_TYPE_GROUND);
+        }
+
         mOldRenderDebugMask = mRenderDebugMask;
-        
+
         mBackfaceCull = TRUE;
 
         stop_glerror();
@@ -454,7 +462,7 @@ void LLPipeline::resizeScreenTexture()
                 }
         
                 mScreen.release();
-                mScreen.allocate(resX, resY, GL_RGBA, TRUE, GL_TEXTURE_RECTANGLE_ARB);          
+                mScreen.allocate(resX, resY, GL_RGBA, TRUE, LLTexUnit::TT_RECT_TEXTURE);                
 
                 llinfos << "RESIZED SCREEN TEXTURE: " << resX << "x" << resY << llendl;
         }
@@ -556,7 +564,7 @@ void LLPipeline::createGLBuffers()
 
                         for (U32 j = 0; j < 3; j++)
                         {
-                                glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, mBlurCubeTexture[j]);
+                                gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_CUBE_MAP, mBlurCubeTexture[j]);
                                 glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
                                 glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
                                 glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -583,10 +591,11 @@ void LLPipeline::createGLBuffers()
                         mGlow[i].allocate(512,glow_res,GL_RGBA,FALSE);
                 }
                 
+
                 GLuint resX = gViewerWindow->getWindowDisplayWidth();
                 GLuint resY = gViewerWindow->getWindowDisplayHeight();
-                
-                mScreen.allocate(resX, resY, GL_RGBA, TRUE, GL_TEXTURE_RECTANGLE_ARB);
+        
+                mScreen.allocate(resX, resY, GL_RGBA, TRUE, LLTexUnit::TT_RECT_TEXTURE);
         }
 }
 
@@ -1212,7 +1221,7 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl
         LLVertexBuffer::unbind();
         LLGLDisable blend(GL_BLEND);
         LLGLDisable test(GL_ALPHA_TEST);
-        LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         gGL.setColorMask(false, false);
         LLGLDepthTest depth(GL_TRUE, GL_FALSE);
@@ -1357,7 +1366,7 @@ void LLPipeline::doOcclusion(LLCamera& camera)
         }
         LLGLDisable blend(GL_BLEND);
         LLGLDisable test(GL_ALPHA_TEST);
-        LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         LLGLDepthTest depth(GL_TRUE, GL_FALSE);
 
         if (LLPipeline::sUseOcclusion > 1)
@@ -2334,7 +2343,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
                 }
         }
 
-        
+        LLAppViewer::instance()->pingMainloopTimeout("Pipeline:ForceVBO");
         
         //by bao
         //fake vertex buffer updating
@@ -2368,7 +2377,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
                 sUnderWaterRender = FALSE;
         }
 
-        LLViewerImage::sDefaultImagep->bind(0);
+        gGL.getTexUnit(0)->bind(LLViewerImage::sDefaultImagep);
         LLViewerImage::sDefaultImagep->setClamp(FALSE, FALSE);
         
         //////////////////////////////////////////////
@@ -2381,12 +2390,16 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
         
         U32 cur_type = 0;
 
+        LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderDrawPools");
+        
         if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_PICKING))
         {
+                LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderForSelect");
                 gObjectList.renderObjectsForSelect(camera, gViewerWindow->getVirtualWindowRect());
         }
         else if (gSavedSettings.getBOOL("RenderDeferred"))
         {
+                LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderDeferred");
                 renderGeomDeferred();
         }
         else
@@ -2474,6 +2487,8 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
                         stop_glerror();
                 }
         }
+        
+        LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderDrawPoolsEnd");
 
         LLVertexBuffer::unbind();
         LLGLState::checkStates();
@@ -2497,6 +2512,8 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
         LLGLState::checkTextureChannels();
         LLGLState::checkClientArrays();
 
+        LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderHighlights");
+
         if (!sReflectionRender)
         {
                 renderHighlights();
@@ -2506,6 +2523,8 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
         // have touch-handlers.
         mHighlightFaces.clear();
 
+        LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderDebug");
+        
         renderDebug();
 
         LLVertexBuffer::unbind();
@@ -2518,6 +2537,8 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
                 gObjectList.resetObjectBeacons();
         }
 
+        LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderGeomEnd");
+
         //HACK: preserve/restore matrices around HUD render
         if (gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_HUD))
         {
@@ -2604,11 +2625,11 @@ void LLPipeline::renderDebug()
                 // Debug composition layers
                 F32 x, y;
 
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                 if (gAgent.getRegion())
                 {
-                        gGL.begin(LLVertexBuffer::POINTS);
+                        gGL.begin(LLRender::POINTS);
                         // Draw the composition layer for the region that I'm in.
                         for (x = 0; x <= 260; x++)
                         {
@@ -2654,6 +2675,7 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects, BOOL render
 
         LLGLSDefault gls_default;
         LLGLSObjectSelect gls_object_select;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         LLGLDepthTest gls_depth(GL_TRUE,GL_TRUE);
         disableLights();
         
@@ -3101,7 +3123,7 @@ void LLPipeline::setupAvatarLights(BOOL for_edit)
                 camera_rot.invert();
                 LLVector4 light_pos = light_pos_cam * camera_rot;
                 
-                light_pos.normVec();
+                light_pos.normalize();
 
                 mHWLightColors[1] = diffuse;
                 glLightfv(GL_LIGHT1, GL_DIFFUSE,  diffuse.mV);
@@ -3119,7 +3141,7 @@ void LLPipeline::setupAvatarLights(BOOL for_edit)
                 LLVector3 opposite_pos = -1.f * mSunDir;
                 LLVector3 orthog_light_pos = mSunDir % LLVector3::z_axis;
                 LLVector4 backlight_pos = LLVector4(lerp(opposite_pos, orthog_light_pos, 0.3f), 0.0f);
-                backlight_pos.normVec();
+                backlight_pos.normalize();
                         
                 LLColor4 light_diffuse = mSunDiffuse;
                 LLColor4 backlight_diffuse(1.f - light_diffuse.mV[VRED], 1.f - light_diffuse.mV[VGREEN], 1.f - light_diffuse.mV[VBLUE], 1.f);
@@ -3458,7 +3480,7 @@ void LLPipeline::setupHWLights(LLDrawPool* pool)
                         atten = x / (light_radius); // % of brightness at radius
                         quad = 0.0f;
                 }
-                //mHWLightColors[cur_light] = light_color;
+                mHWLightColors[2] = light_color;
                 S32 gllight = GL_LIGHT2;
                 glLightfv(gllight, GL_POSITION, light_pos_gl.mV);
                 glLightfv(gllight, GL_DIFFUSE,  light_color.mV);
@@ -3999,6 +4021,7 @@ BOOL LLPipeline::getRenderHighlights(void*)
 }
 
 LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector3& start, const LLVector3& end,
+                                                                                                                BOOL pick_transparent,                                                                                          
                                                                                                                 S32* face_hit,
                                                                                                                 LLVector3* intersection,         // return the intersection point
                                                                                                                 LLVector2* tex_coord,            // return the texture coordinates of the intersection point
@@ -4008,6 +4031,12 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector3& start,
 {
         LLDrawable* drawable = NULL;
 
+        LLVector3 local_end = end;
+
+        LLVector3 position;
+
+        sPickAvatar = FALSE; //LLToolMgr::getInstance()->inBuildMode() ? FALSE : TRUE;
+        
         for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
                         iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
@@ -4015,24 +4044,124 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector3& start,
 
                 for (U32 j = 0; j < LLViewerRegion::NUM_PARTITIONS; j++)
                 {
-                        if ((j == LLViewerRegion::PARTITION_VOLUME) || (j == LLViewerRegion::PARTITION_BRIDGE))  // only check these partitions for now
+                        if ((j == LLViewerRegion::PARTITION_VOLUME) || 
+                                (j == LLViewerRegion::PARTITION_BRIDGE) || 
+                                (j == LLViewerRegion::PARTITION_TERRAIN) ||
+                                (j == LLViewerRegion::PARTITION_TREE) ||
+                                (j == LLViewerRegion::PARTITION_GRASS))  // only check these partitions for now
                         {
                                 LLSpatialPartition* part = region->getSpatialPartition(j);
-                                if (part)
+                                if (part && hasRenderType(part->mDrawableType))
                                 {
-                                        LLDrawable* hit = part->lineSegmentIntersect(start, end, face_hit, intersection, tex_coord, normal, bi_normal);
+                                        LLDrawable* hit = part->lineSegmentIntersect(start, local_end, pick_transparent, face_hit, &position, tex_coord, normal, bi_normal);
                                         if (hit)
                                         {
                                                 drawable = hit;
+                                                local_end = position;                                           
+                                        }
+                                }
+                        }
+                }
+        }
+        
+        if (!sPickAvatar)
+        {
+                //save hit info in case we need to restore
+                //due to attachment override
+                LLVector3 local_normal;
+                LLVector3 local_binormal;
+                LLVector2 local_texcoord;
+                S32 local_face_hit = -1;
+
+                if (face_hit)
+                { 
+                        local_face_hit = *face_hit;
+                }
+                if (tex_coord)
+                {
+                        local_texcoord = *tex_coord;
+                }
+                if (bi_normal)
+                {
+                        local_binormal = *bi_normal;
+                }
+                if (normal)
+                {
+                        local_normal = *normal;
+                }
+                                
+                const F32 ATTACHMENT_OVERRIDE_DIST = 0.1f;
+
+                //check against avatars
+                sPickAvatar = TRUE;
+                for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                                iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+                {
+                        LLViewerRegion* region = *iter;
+
+                        LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_BRIDGE);
+                        if (part && hasRenderType(part->mDrawableType))
+                        {
+                                LLDrawable* hit = part->lineSegmentIntersect(start, local_end, pick_transparent, face_hit, &position, tex_coord, normal, bi_normal);
+                                if (hit)
+                                {
+                                        if (!drawable || 
+                                                !drawable->getVObj()->isAttachment() ||
+                                                (position-local_end).magVec() > ATTACHMENT_OVERRIDE_DIST)
+                                        { //avatar overrides if previously hit drawable is not an attachment or 
+                                          //attachment is far enough away from detected intersection
+                                                drawable = hit;
+                                                local_end = position;                                           
+                                        }
+                                        else
+                                        { //prioritize attachments over avatars
+                                                position = local_end;
+
+                                                if (face_hit)
+                                                {
+                                                        *face_hit = local_face_hit;
+                                                }
+                                                if (tex_coord)
+                                                {
+                                                        *tex_coord = local_texcoord;
+                                                }
+                                                if (bi_normal)
+                                                {
+                                                        *bi_normal = local_binormal;
+                                                }
+                                                if (normal)
+                                                {
+                                                        *normal = local_normal;
+                                                }
                                         }
                                 }
                         }
                 }
         }
+
+        //check all avatar nametags (silly, isn't it?)
+        for (std::vector< LLCharacter* >::iterator iter = LLCharacter::sInstances.begin();
+                iter != LLCharacter::sInstances.end();
+                ++iter)
+        {
+                LLVOAvatar* av = (LLVOAvatar*) *iter;
+                if (av->mNameText.notNull() && av->mNameText->lineSegmentIntersect(start, local_end, position))
+                {
+                        drawable = av->mDrawable;
+                        local_end = position;
+                }
+        }
+
+        if (intersection)
+        {
+                *intersection = position;
+        }
+
         return drawable ? drawable->getVObj().get() : NULL;
 }
 
 LLViewerObject* LLPipeline::lineSegmentIntersectInHUD(const LLVector3& start, const LLVector3& end,
+                                                                                                          BOOL pick_transparent,                                                                                                        
                                                                                                           S32* face_hit,
                                                                                                           LLVector3* intersection,         // return the intersection point
                                                                                                           LLVector2* tex_coord,            // return the texture coordinates of the intersection point
@@ -4047,15 +4176,27 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInHUD(const LLVector3& start, co
         {
                 LLViewerRegion* region = *iter;
 
+                BOOL toggle = FALSE;
+                if (!hasRenderType(LLPipeline::RENDER_TYPE_HUD))
+                {
+                        toggleRenderType(LLPipeline::RENDER_TYPE_HUD);
+                        toggle = TRUE;
+                }
+
                 LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_HUD);
                 if (part)
                 {
-                        LLDrawable* hit = part->lineSegmentIntersect(start, end, face_hit, intersection, tex_coord, normal, bi_normal);
+                        LLDrawable* hit = part->lineSegmentIntersect(start, end, pick_transparent, face_hit, intersection, tex_coord, normal, bi_normal);
                         if (hit)
                         {
                                 drawable = hit;
                         }
                 }
+
+                if (toggle)
+                {
+                        toggleRenderType(LLPipeline::RENDER_TYPE_HUD);
+                }
         }
         return drawable ? drawable->getVObj().get() : NULL;
 }
@@ -4209,7 +4350,8 @@ void LLPipeline::generateReflectionMap(LLCubeMap* cube_map, LLCamera& cube_cam)
 
         LLPipeline::sReflectionRender = TRUE;
 
-        cube_map->bind();
+        gGL.getTexUnit(cube_map->getStage())->bind(cube_map);
+        gGL.getTexUnit(0)->activate();
         GLint width;
         glGetTexLevelParameteriv(GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, 0, GL_TEXTURE_WIDTH, &width);
         if (width != res)
@@ -4221,8 +4363,10 @@ void LLPipeline::generateReflectionMap(LLCubeMap* cube_map, LLCamera& cube_cam)
                         glTexImage2D(gl_cube_face[i], 0, GL_RGBA, res, res, 0, GL_RGBA, GL_FLOAT, NULL); 
                 }
         }
-        glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);
-        cube_map->disable();
+        gGL.getTexUnit(cube_map->getStage())->unbind(LLTexUnit::TT_CUBE_MAP);
+        gGL.getTexUnit(cube_map->getStage())->disable();
+        gGL.getTexUnit(0)->activate();
+        gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
 
         BOOL toggle_ui = gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI);
         if (toggle_ui)
@@ -4266,7 +4410,7 @@ void LLPipeline::generateReflectionMap(LLCubeMap* cube_map, LLCamera& cube_cam)
         gPipeline.calcNearbyLights(cube_cam);
 
         stop_glerror();
-        LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, mCubeFrameBuffer);
         glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
                                                                                 GL_RENDERBUFFER_EXT, mCubeDepth);               
@@ -4422,7 +4566,8 @@ void LLPipeline::blurReflectionMap(LLCubeMap* cube_in, LLCubeMap* cube_out)
         glPushMatrix();
 
         cube_out->enableTexture(0);
-        cube_out->bind();
+        gGL.getTexUnit(cube_out->getStage())->bind(cube_out);
+        gGL.getTexUnit(0)->activate();
         GLint width;
         glGetTexLevelParameteriv(GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, 0, GL_TEXTURE_WIDTH, &width);
         if (width != res)
@@ -4434,8 +4579,8 @@ void LLPipeline::blurReflectionMap(LLCubeMap* cube_in, LLCubeMap* cube_out)
                         glTexImage2D(gl_cube_face[i], 0, GL_RGBA, res, res, 0, GL_RGBA, GL_FLOAT, NULL); 
                 }
         }
-        glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);
-
+        gGL.getTexUnit(cube_out->getStage())->unbind(LLTexUnit::TT_CUBE_MAP);
+        gGL.getTexUnit(0)->activate();
         glViewport(0, 0, res, res);
         LLGLEnable blend(GL_BLEND);
         
@@ -4463,16 +4608,17 @@ void LLPipeline::blurReflectionMap(LLCubeMap* cube_in, LLCubeMap* cube_out)
 
                 if (j == 0)
                 {
-                        cube_in->bind();
+                        gGL.getTexUnit(cube_in->getStage())->bind(cube_in);
                 }
                 else
                 {
-                        glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, mBlurCubeTexture[j-1]);
+                        gGL.getTexUnit(cube_in->getStage())->bindManual(LLTexUnit::TT_CUBE_MAP, mBlurCubeTexture[j-1]);
                 }
+                gGL.getTexUnit(0)->activate();
 
                 stop_glerror();
 
-                LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, mBlurCubeBuffer[j]);
                 stop_glerror();
 
@@ -4501,7 +4647,7 @@ void LLPipeline::blurReflectionMap(LLCubeMap* cube_in, LLCubeMap* cube_out)
 
         stop_glerror();
 
-        glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);
+        gGL.getTexUnit(cube_in->getStage())->unbind(LLTexUnit::TT_CUBE_MAP);
         
         glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
         gGL.setColorMask(true, false);
@@ -4510,7 +4656,8 @@ void LLPipeline::blurReflectionMap(LLCubeMap* cube_in, LLCubeMap* cube_out)
         glMatrixMode(GL_MODELVIEW);
         glPopMatrix();
 
-        cube_in->disableTexture();
+        gGL.getTexUnit(cube_in->getStage())->disable();
+        gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
         gViewerWindow->setupViewport();
         gGL.setSceneBlendType(LLRender::BT_ALPHA);
 
@@ -4578,7 +4725,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
 
         if (for_snapshot)
         {
-                mGlow[1].bindTexture();
+                gGL.getTexUnit(0)->bind(&mGlow[1]);
                 {
                         //LLGLEnable stencil(GL_STENCIL_TEST);
                         //glStencilFunc(GL_NOTEQUAL, 255, 0xFFFFFFFF);
@@ -4587,7 +4734,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
                         LLGLEnable blend(GL_BLEND);
                         gGL.setSceneBlendType(LLRender::BT_ADD);
                         tc2.setVec(1,1);                                
-                        gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
+                        gGL.begin(LLRender::TRIANGLE_STRIP);
                         gGL.color4f(1,1,1,1);
                         gGL.texCoord2f(tc1.mV[0], tc1.mV[1]);
                         gGL.vertex2f(-1,-1);
@@ -4637,15 +4784,15 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
                 LLGLEnable test(GL_ALPHA_TEST);
                 gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
                 gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA);
-                LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
                 
-                glDisable(GL_TEXTURE_2D);
-                glEnable(GL_TEXTURE_RECTANGLE_ARB);
-                mScreen.bindTexture();
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);               
+                gGL.getTexUnit(0)->disable();
+                gGL.getTexUnit(0)->enable(LLTexUnit::TT_RECT_TEXTURE);
+                gGL.getTexUnit(0)->bind(&mScreen);
 
                 gGL.color4f(1,1,1,1);
                 gPipeline.enableLightsFullbright(LLColor4(1,1,1,1));
-                gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
+                gGL.begin(LLRender::TRIANGLE_STRIP);
                 gGL.texCoord2f(tc1.mV[0], tc1.mV[1]);
                 gGL.vertex2f(-1,-1);
                 
@@ -4659,8 +4806,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
                 gGL.vertex2f(1,1);
                 gGL.end();
                 
-                glEnable(GL_TEXTURE_2D);
-                glDisable(GL_TEXTURE_RECTANGLE_ARB);
+                gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
 
                 mGlow[2].flush();
         }
@@ -4690,7 +4836,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
 
         for (S32 i = 0; i < kernel; i++)
         {
-                LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 {
                         LLFastTimer ftm(LLFastTimer::FTM_RENDER_BLOOM_FBO);
                         mGlow[i%2].bindTarget();
@@ -4699,11 +4845,11 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
                         
                 if (i == 0)
                 {
-                        mGlow[2].bindTexture();
+                        gGL.getTexUnit(0)->bind(&mGlow[2]);
                 }
                 else
                 {
-                        mGlow[(i-1)%2].bindTexture();
+                        gGL.getTexUnit(0)->bind(&mGlow[(i-1)%2]);
                 }
 
                 if (i%2 == 0)
@@ -4715,7 +4861,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
                         gGlowProgram.uniform2f("glowDelta", 0, delta);
                 }
 
-                gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
+                gGL.begin(LLRender::TRIANGLE_STRIP);
                 gGL.texCoord2f(tc1.mV[0], tc1.mV[1]);
                 gGL.vertex2f(-1,-1);
                 
@@ -4780,8 +4926,8 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
                 LLGLEnable blend(GL_BLEND);
                 gGL.blendFunc(GL_ONE, GL_ONE);
 
-                glDisable(GL_TEXTURE_2D);
-                glEnable(GL_TEXTURE_RECTANGLE_ARB);
+                gGL.getTexUnit(0)->disable();
+                gGL.getTexUnit(0)->enable(LLTexUnit::TT_RECT_TEXTURE);
                 mScreen.bindTexture();
                 
                 gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
@@ -4801,8 +4947,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
 
                 gGL.flush();
                 
-                glEnable(GL_TEXTURE_2D);
-                glDisable(GL_TEXTURE_RECTANGLE_ARB);
+                gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
 
                 gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         }*/
@@ -4847,12 +4992,12 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
 
                 //tex unit 0
                 gGL.getTexUnit(0)->setTextureColorBlend(LLTexUnit::TBO_REPLACE, LLTexUnit::TBS_TEX_COLOR);
-                
-                mGlow[1].bindTexture();
+        
+                gGL.getTexUnit(0)->bind(&mGlow[1]);
                 glEnableClientState(GL_TEXTURE_COORD_ARRAY);
                 glTexCoordPointer(2, GL_FLOAT, 0, uv0);
                 gGL.getTexUnit(1)->activate();
-                glEnable(GL_TEXTURE_RECTANGLE_ARB);
+                gGL.getTexUnit(1)->enable(LLTexUnit::TT_RECT_TEXTURE);
                 
                 //tex unit 1
                 gGL.getTexUnit(1)->setTextureColorBlend(LLTexUnit::TBO_ADD, LLTexUnit::TBS_TEX_COLOR, LLTexUnit::TBS_PREV_COLOR);
@@ -4863,14 +5008,16 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
 
                 glVertexPointer(2, GL_FLOAT, 0, v);
                 
-                mScreen.bindTexture();
+                gGL.getTexUnit(1)->bind(&mScreen);
+                gGL.getTexUnit(1)->activate();
                 
                 LLGLEnable multisample(GL_MULTISAMPLE_ARB);
                 glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
                 
-                glDisable(GL_TEXTURE_RECTANGLE_ARB);
+                gGL.getTexUnit(1)->disable();
                 glDisableClientState(GL_TEXTURE_COORD_ARRAY);
                 gGL.getTexUnit(1)->setTextureBlendType(LLTexUnit::TB_MULT);
+
                 glClientActiveTextureARB(GL_TEXTURE0_ARB);
                 gGL.getTexUnit(0)->activate();
                 glDisableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -4948,7 +5095,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
 
                 if (!LLViewerCamera::getInstance()->cameraUnderWater())
                 {       //generate planar reflection map
-                        LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         glClearColor(0,0,0,0);
                         gGL.setColorMask(true, true);
                         mWaterRef.bindTarget();
@@ -5053,7 +5200,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
                         }
                         LLViewerCamera::updateFrustumPlanes(camera);
 
-                        LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         LLColor4& col = LLDrawPoolWater::sWaterFogColor;
                         glClearColor(col.mV[0], col.mV[1], col.mV[2], 0.f);
                         gGL.setColorMask(true, true);
@@ -5185,11 +5332,11 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
 
         LLVector3 left = camera.getLeftAxis();
         left *= left;
-        left.normVec();
+        left.normalize();
 
         LLVector3 up = camera.getUpAxis();
         up *= up;
-        up.normVec();
+        up.normalize();
 
         tdim.mV[0] = fabsf(half_height * left);
         tdim.mV[1] = fabsf(half_height * up);
@@ -5230,10 +5377,10 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
                 resY != avatar->mImpostor.getHeight())
         {
                 avatar->mImpostor.allocate(resX,resY,GL_RGBA,TRUE);
-                avatar->mImpostor.bindTexture();
+                gGL.getTexUnit(0)->bind(&avatar->mImpostor);
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         }
 
         {
@@ -5270,13 +5417,13 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
                 }
                 
                 gGL.setSceneBlendType(LLRender::BT_ADD);
-                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                 LLGLDepthTest depth(GL_FALSE, GL_FALSE);
 
                 gGL.color4f(1,1,1,1);
                 gGL.color4ub(64,64,64,255);
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
                 gGL.vertex3fv((pos+left-up).mV);
                 gGL.vertex3fv((pos-left-up).mV);
                 gGL.vertex3fv((pos-left+up).mV);