diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-21 07:55:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-21 07:55:46 +0200 |
| commit | 1bf52245e51f23656a3520056b440a633ea5a61b (patch) | |
| tree | 4e175b2e2a4a843e101d582ba996eaef336f90fc /mesalib/src/mesa/main/teximage.c | |
| parent | 0f140f539691e1657d8ea0fcbcca2d5947574406 (diff) | |
| parent | 7cd970786d72a68b735f33904bdded6c8aebdf33 (diff) | |
| download | vcxsrv-1bf52245e51f23656a3520056b440a633ea5a61b.tar.gz vcxsrv-1bf52245e51f23656a3520056b440a633ea5a61b.tar.bz2 vcxsrv-1bf52245e51f23656a3520056b440a633ea5a61b.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/teximage.c')
| -rw-r--r-- | mesalib/src/mesa/main/teximage.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index 569adc16a..fd02a1be2 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -946,6 +946,7 @@ _mesa_max_texture_levels(struct gl_context *ctx, GLenum target) case GL_TEXTURE_3D: case GL_PROXY_TEXTURE_3D: return ctx->Const.Max3DTextureLevels; + case GL_TEXTURE_CUBE_MAP: case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB: case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB: case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB: @@ -966,6 +967,9 @@ _mesa_max_texture_levels(struct gl_context *ctx, GLenum target) ctx->Extensions.EXT_texture_array) ? ctx->Const.MaxTextureLevels : 0; case GL_TEXTURE_BUFFER: + return _mesa_is_desktop_gl(ctx) && + (ctx->Extensions.ARB_texture_buffer_object || + (ctx->Version >= 31)) ? 1 : 0; case GL_TEXTURE_EXTERNAL_OES: /* fall-through */ default: |