diff options
| author | Brian Paul <[email protected]> | 2009-12-21 18:35:54 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-12-21 18:35:54 -0700 |
| commit | 9eb7fc6661a1d46c06cec8584b898e3e690af6fa (patch) | |
| tree | 78ed4336c613303ef02691baf4d89e7330a0f6cf /progs/glsl/texaaline.c | |
| parent | ae1c0a06e81b8c6f015a3b64616a5d3a989f9373 (diff) | |
| parent | b57abd3bea29e95e5dee2524c3f1be4b26017c0f (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c
Diffstat (limited to 'progs/glsl/texaaline.c')
| -rw-r--r-- | progs/glsl/texaaline.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/progs/glsl/texaaline.c b/progs/glsl/texaaline.c index 4ad5a761c67..00edab73108 100644 --- a/progs/glsl/texaaline.c +++ b/progs/glsl/texaaline.c @@ -310,10 +310,8 @@ MakeMipmap(void) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - /* - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 4); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 5); - */ + /* glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 4); */ + /* glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 5); */ glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); #undef SZ |