Skip to content

Commit

Permalink
Don't attempt to filter manually for now
Browse files Browse the repository at this point in the history
This was rather... random. Might add it back later.
  • Loading branch information
KristianLyng committed Jul 11, 2010
1 parent d109acd commit e4e9022
Showing 1 changed file with 0 additions and 25 deletions.
25 changes: 0 additions & 25 deletions src/ezoom.cpp
Expand Up @@ -432,7 +432,6 @@ EZoomScreen::glPaintOutput (const GLScreenPaintAttrib &attrib,
if (isActive (out))
{
GLScreenPaintAttrib sa = attrib;
int saveFilter;
GLMatrix zTransform = transform;

mask &= ~PAINT_SCREEN_REGION_MASK;
Expand All @@ -446,18 +445,11 @@ EZoomScreen::glPaintOutput (const GLScreenPaintAttrib &attrib,
0);

mask |= PAINT_SCREEN_TRANSFORMED_MASK;
saveFilter = gScreen->textureFilter ();

if (optionGetFilterLinear ())
gScreen->setTextureFilter (GLTexture::Good);
else
gScreen->setTextureFilter (GLTexture::Fast);

status = gScreen->glPaintOutput (sa, zTransform, region, output, mask);

drawCursor (output, transform);

gScreen->setTextureFilter (saveFilter);
}
else
{
Expand Down Expand Up @@ -1119,32 +1111,15 @@ EZoomScreen::updateCursor (CursorTexture * cursor)
{
cursor->isSet = true;
cursor->screen = screen;
// makeScreenCurrent (s); // ???
glEnable (GL_TEXTURE_RECTANGLE_ARB);
glGenTextures (1, &cursor->texture);
glBindTexture (GL_TEXTURE_RECTANGLE_ARB, cursor->texture);

if (optionGetFilterLinear () &&
gScreen->textureFilter () != GL_NEAREST) // ???
{
glTexParameteri (GL_TEXTURE_RECTANGLE_ARB,
GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri (GL_TEXTURE_RECTANGLE_ARB,
GL_TEXTURE_MAG_FILTER, GL_LINEAR);
}
else
{
glTexParameteri (GL_TEXTURE_RECTANGLE_ARB,
GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri (GL_TEXTURE_RECTANGLE_ARB,
GL_TEXTURE_MAG_FILTER, GL_NEAREST);
}
glTexParameteri (GL_TEXTURE_RECTANGLE_ARB,
GL_TEXTURE_WRAP_S, GL_CLAMP);
glTexParameteri (GL_TEXTURE_RECTANGLE_ARB,
GL_TEXTURE_WRAP_T, GL_CLAMP);
} else {
//makeScreenCurrent (cursor->screen); ???
glEnable (GL_TEXTURE_RECTANGLE_ARB);
}

Expand Down

0 comments on commit e4e9022

Please sign in to comment.