diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-11-30 12:37:51 -0700 | 
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-11-30 17:04:35 -0700 | 
| commit | 4d6963bd812b45c713ab83d5e90367e04d3ab5b1 (patch) | |
| tree | d0f9639ec21b5d54ec14b22ded536d185f165f08 | |
| parent | fab60f242ef7e3aac299c8373f486cb9fa92494c (diff) | |
SL-16386 purge write-only state member LLCubeMap::mTextureCoordStage
| -rw-r--r-- | indra/llrender/llcubemap.cpp | 12 | ||||
| -rw-r--r-- | indra/llrender/llcubemap.h | 3 | ||||
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 2 | 
3 files changed, 0 insertions, 17 deletions
| diff --git a/indra/llrender/llcubemap.cpp b/indra/llrender/llcubemap.cpp index d2faa5f3ae..834084674e 100644 --- a/indra/llrender/llcubemap.cpp +++ b/indra/llrender/llcubemap.cpp @@ -47,7 +47,6 @@ bool LLCubeMap::sUseCubeMaps = true;  LLCubeMap::LLCubeMap(bool init_as_srgb)  	: mTextureStage(0), -	  mTextureCoordStage(0),  	  mMatrixStage(0),  	  mIssRGB(init_as_srgb)  { @@ -180,7 +179,6 @@ void LLCubeMap::bind()  void LLCubeMap::enable(S32 stage)  {  	enableTexture(stage); -	enableTextureCoords(stage);  }  void LLCubeMap::enableTexture(S32 stage) @@ -192,15 +190,9 @@ void LLCubeMap::enableTexture(S32 stage)  	}  } -void LLCubeMap::enableTextureCoords(S32 stage) -{ -	mTextureCoordStage = stage; -} -  void LLCubeMap::disable(void)  {  	disableTexture(); -	disableTextureCoords();  }  void LLCubeMap::disableTexture(void) @@ -215,10 +207,6 @@ void LLCubeMap::disableTexture(void)  	}  } -void LLCubeMap::disableTextureCoords(void) -{ -} -  void LLCubeMap::setMatrix(S32 stage)  {  	mMatrixStage = stage; diff --git a/indra/llrender/llcubemap.h b/indra/llrender/llcubemap.h index 95b6d12099..a01636d8d4 100644 --- a/indra/llrender/llcubemap.h +++ b/indra/llrender/llcubemap.h @@ -48,12 +48,10 @@ public:  	void enable(S32 stage);  	void enableTexture(S32 stage); -	void enableTextureCoords(S32 stage);  	S32	 getStage(void) { return mTextureStage; }  	void disable(void);  	void disableTexture(void); -	void disableTextureCoords(void);  	void setMatrix(S32 stage);  	void restoreMatrix();  	void setReflection (void); @@ -80,7 +78,6 @@ protected:  	LLPointer<LLImageGL> mImages[6];  	LLPointer<LLImageRaw> mRawImages[6];  	S32 mTextureStage; -	S32 mTextureCoordStage;  	S32 mMatrixStage;  }; diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index cd4aada822..9d19ff44db 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -383,7 +383,6 @@ void LLDrawPoolBump::bindCubeMap(LLGLSLShader* shader, S32 shader_level, S32& di  				// the cube map in the one pass shiny shaders  				cube_channel = shader->enableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP);  				cube_map->enableTexture(cube_channel); -				cube_map->enableTextureCoords(1);  				diffuse_channel = shader->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP);  			}  			else @@ -534,7 +533,6 @@ void LLDrawPoolBump::beginFullbrightShiny()  		gGL.getTexUnit(1)->disable();  		cube_channel = shader->enableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP);  		cube_map->enableTexture(cube_channel); -		cube_map->enableTextureCoords(1);  		diffuse_channel = shader->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP);  		gGL.getTexUnit(cube_channel)->bind(cube_map); | 
