Lovely...for some very strange reason, anisotropic filtering will not work in OpenGL......Reverted.

This commit is contained in:
mudlord 2007-11-08 11:31:25 +00:00
parent bdda7f894d
commit 620e47a820
3 changed files with 0 additions and 27 deletions

View File

@ -585,21 +585,6 @@ void MainWnd::OnUpdateOptionsVideoRenderoptionsGlbilinear(CCmdUI* pCmdUI)
pCmdUI->SetCheck(theApp.glFilter == 1);
}
void MainWnd::OnOptionsVideoRenderoptionsGlanisotropic()
{
theApp.glFilter = 2;
if( theApp.display ) {
theApp.display->setOption( _T("glFilter"), theApp.glFilter );
}
}
void MainWnd::OnUpdateOptionsVideoRenderoptionsGlanisotropic(CCmdUI* pCmdUI)
{
pCmdUI->SetCheck(theApp.glFilter == 2);
}
void MainWnd::OnOptionsVideoRenderoptionsGltriangle()
{
theApp.glType = 0;

View File

@ -35,10 +35,6 @@
#include <gl/glext.h>
typedef BOOL (APIENTRY *PFNWGLSWAPINTERVALFARPROC)( int );
#ifndef GL_TEXTURE_MAX_ANISOTROPY_EXT
#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE
#endif
extern int Init_2xSaI(u32);
extern void winlog(const char *,...);
extern int systemSpeed;
@ -497,13 +493,6 @@ void OpenGLDisplay::updateFiltering( int value )
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
break;
case 2:
float largest_supported_anisotropy;
glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &largest_supported_anisotropy);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, largest_supported_anisotropy);
break;
}
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP );

View File

@ -1552,7 +1552,6 @@ BEGIN
MENUITEM "&OpenGL", ID_OPTIONS_VIDEO_RENDERMETHOD_OPENGL
MENUITEM " Filter: Nearest", ID_OPTIONS_VIDEO_RENDEROPTIONS_GLNEAREST
MENUITEM " Filter: Bilinear", ID_OPTIONS_VIDEO_RENDEROPTIONS_GLBILINEAR
MENUITEM " Filter: Anisotropic", ID_OPTIONS_VIDEO_RENDEROPTIONS_GLANISOTROPIC
MENUITEM " Vertex: Triangle", ID_OPTIONS_VIDEO_RENDEROPTIONS_GLTRIANGLE
MENUITEM " Vertex: Quads", ID_OPTIONS_VIDEO_RENDEROPTIONS_GLQUADS
MENUITEM SEPARATOR