From d27b329afb77872027ffcfb34d07f2acaf64d0b4 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Mon, 25 Feb 2013 13:02:22 -0600 Subject: [PATCH] Minor bit of cleanup. Also now using glTexGenf instead of glTexGeni for fixed-function water texcoords. --- indra/llcommon/llmemtype.h | 1 - indra/newview/lldrawable.h | 1 - indra/newview/lldrawpoolwater.cpp | 4 ++-- indra/newview/llviewerobject.h | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/indra/llcommon/llmemtype.h b/indra/llcommon/llmemtype.h index 2a411eb90..9c3c98937 100644 --- a/indra/llcommon/llmemtype.h +++ b/indra/llcommon/llmemtype.h @@ -40,7 +40,6 @@ #include -#define MEM_TYPE_NEW(T) class LL_COMMON_API LLMemType { diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h index e2ea0140f..a9bec244f 100644 --- a/indra/newview/lldrawable.h +++ b/indra/newview/lldrawable.h @@ -93,7 +93,6 @@ public: } LLDrawable() { init(); } - MEM_TYPE_NEW(LLMemType::MTYPE_DRAWABLE); void markDead(); // Mark this drawable as dead BOOL isDead() const { return isState(DEAD); } diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index 2154c0495..91fbf7cbe 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -414,8 +414,8 @@ void LLDrawPoolWater::renderOpaqueLegacyWater() { glEnable(GL_TEXTURE_GEN_S); //texture unit 0 glEnable(GL_TEXTURE_GEN_T); //texture unit 0 - glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); - glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); + glTexGenf(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); + glTexGenf(GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); } // Use the fact that we know all water faces are the same size diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 0afebcbc3..8b4693c79 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -133,7 +133,6 @@ public: typedef const child_list_t const_child_list_t; LLViewerObject(const LLUUID &id, const LLPCode type, LLViewerRegion *regionp, BOOL is_global = FALSE); - MEM_TYPE_NEW(LLMemType::MTYPE_OBJECT); virtual void markDead(); // Mark this object as dead, and clean up its references BOOL isDead() const {return mDead;}