diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-10-12 04:41:28 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-10-12 04:41:28 +0400 |
| commit | d241d0a37993ef9fd92cbc53f51fa35e0963d837 (patch) | |
| tree | 036ec10dfe923cfd7228bf42ce0acb9bc4498575 | |
| parent | 78cc88e041caf8a05d4dfb60dcca9d885038cfdd (diff) | |
Fix for opengl errors being thrown when creating textures, it was
setting the magnification to GL_LINEAR_MIPMAP_NEAREST but that is
only valid for minifaction, should be GL_LINEAR instead. OpenGL
driver should refuse setting this so should be harmless, but better
to fix it anyway.
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 2cd548afe52..4025a12a867 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -220,12 +220,24 @@ static int gpu_get_mipmap(void) return GTS.domipmap && (!(G.f & G_TEXTUREPAINT)); } -static GLenum gpu_get_mipmap_filter() +static GLenum gpu_get_mipmap_filter(int mag) { - /* linearmipmap is off by default - * when mipmapping is off, use unfiltered display */ - return GTS.linearmipmap? GL_LINEAR_MIPMAP_LINEAR : - (GTS.domipmap ? GL_LINEAR_MIPMAP_NEAREST : GL_NEAREST); + /* linearmipmap is off by default *when mipmapping is off, + * use unfiltered display */ + if(mag) { + if(GTS.linearmipmap || GTS.domipmap) + return GL_LINEAR; + else + return GL_NEAREST; + } + else { + if(GTS.linearmipmap) + return GL_LINEAR_MIPMAP_LINEAR; + else if(GTS.domipmap) + return GL_LINEAR_MIPMAP_NEAREST; + else + return GL_NEAREST; + } } /* Set OpenGL state for an MTFace */ @@ -479,12 +491,12 @@ int GPU_verify_image(Image *ima, int tftile, int tfmode, int compare) if (!gpu_get_mipmap()) { glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, rectw, recth, 0, GL_RGBA, GL_UNSIGNED_BYTE, rect); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gpu_get_mipmap_filter()); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gpu_get_mipmap_filter(1)); } else { gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, rectw, recth, GL_RGBA, GL_UNSIGNED_BYTE, rect); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gpu_get_mipmap_filter()); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gpu_get_mipmap_filter()); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gpu_get_mipmap_filter(0)); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gpu_get_mipmap_filter(1)); ima->tpageflag |= IMA_MIPMAP_COMPLETE; } @@ -576,8 +588,8 @@ void GPU_paint_set_mipmap(int mipmap) if(ima->bindcode) { if(ima->tpageflag & IMA_MIPMAP_COMPLETE) { glBindTexture(GL_TEXTURE_2D, ima->bindcode); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gpu_get_mipmap_filter()); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gpu_get_mipmap_filter()); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gpu_get_mipmap_filter(0)); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gpu_get_mipmap_filter(1)); } else GPU_free_image(ima); @@ -590,7 +602,7 @@ void GPU_paint_set_mipmap(int mipmap) if(ima->bindcode) { glBindTexture(GL_TEXTURE_2D, ima->bindcode); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gpu_get_mipmap_filter()); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gpu_get_mipmap_filter(1)); } } } |