Commits

leslie_linden  committed 6e1580a

SH-1865 FIX -- removed some old non-deferred rendering code that was preventing anti-aliasing from working when GL_ARB_texture_multisample is unsupported

  • Participants
  • Parent commits ff33c63

Comments (0)

Files changed (3)

File indra/llrender/llgl.cpp

 	return gl_string;
 }
 
-U32 LLGLManager::getNumFBOFSAASamples(U32 samples)
-{
-	samples = llmin(samples, (U32) mMaxColorTextureSamples);
-	samples = llmin(samples, (U32) mMaxDepthTextureSamples);
-	samples = llmin(samples, (U32) 4);
-	return samples;
-}
-
 void LLGLManager::shutdownGL()
 {
 	if (mInited)

File indra/llrender/llgl.h

 	void printGLInfoString();
 	void getGLInfo(LLSD& info);
 
-	U32 getNumFBOFSAASamples(U32 desired_samples = 32);
 	// In ALL CAPS
 	std::string mGLVendor;
 	std::string mGLVendorShort;

File indra/newview/pipeline.cpp

 void LLPipeline::allocateScreenBuffer(U32 resX, U32 resY)
 {
 	refreshCachedSettings();
-	U32 samples = gGLManager.getNumFBOFSAASamples(RenderFSAASamples);
+	U32 samples = RenderFSAASamples;
 
 	//try to allocate screen buffers at requested resolution and samples
 	// - on failure, shrink number of samples and try again
 
 BOOL LLPipeline::canUseAntiAliasing() const
 {
-	// We can use anti-aliasing if the GL manager can support some multisampling
-	BOOL can_fsaa = (gGLManager.getNumFBOFSAASamples(2) > 1);
-	return can_fsaa;
+	return TRUE;
 }
 
 void LLPipeline::unloadShaders()