diff options
| author | Brian Paul <brianp@vmware.com> | 2012-03-17 16:30:03 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2012-03-20 08:23:32 -0600 |
| commit | 73fd269d2f5aa2a0b9bc03ef904b81e263e3cc37 (patch) | |
| tree | 1839105a2ce1d882e774437f78e78f28763fbc0f | |
| parent | f4a93e0665881dd58a95abb6525676bd1cc2e6af (diff) | |
mesa: add integer texture completeness check
Per the spec, only nearest filtering is supported for integer textures.
Otherwise, the texture is incomplete.
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/texobj.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/texobj.h | 8 |
3 files changed, 15 insertions, 0 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index c6e5b9467c0..a3827d48d78 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1318,6 +1318,7 @@ struct gl_texture_object GLboolean GenerateMipmap; /**< GL_SGIS_generate_mipmap */ GLboolean _BaseComplete; /**< Is the base texture level valid? */ GLboolean _MipmapComplete; /**< Is the whole mipmap valid? */ + GLboolean _IsIntegerFormat; /**< Does the texture store integer values? */ GLboolean _RenderToTexture; /**< Any rendering to this texture? */ GLboolean Purgeable; /**< Is the buffer purgeable under memory pressure? */ GLboolean Immutable; /**< GL_ARB_texture_storage */ diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index da27d9236e9..d641e40ad72 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -478,6 +478,12 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx, return; } + /* Check if the texture values are integer */ + { + GLenum datatype = _mesa_get_format_datatype(baseImage->TexFormat); + t->_IsIntegerFormat = datatype == GL_INT || datatype == GL_UNSIGNED_INT; + } + /* Compute _MaxLevel (the maximum mipmap level we'll sample from given the * mipmap image sizes and GL_TEXTURE_MAX_LEVEL state). */ diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h index 850091e9636..c020b901382 100644 --- a/src/mesa/main/texobj.h +++ b/src/mesa/main/texobj.h @@ -83,6 +83,14 @@ static inline GLboolean _mesa_is_texture_complete(const struct gl_texture_object *texObj, const struct gl_sampler_object *sampler) { + if (texObj->_IsIntegerFormat && + (sampler->MagFilter != GL_NEAREST || + (sampler->MinFilter != GL_NEAREST && + sampler->MinFilter != GL_NEAREST_MIPMAP_NEAREST))) { + /* If the format is integer, only nearest filtering is allowed */ + return GL_FALSE; + } + if (_mesa_is_mipmap_filter(sampler)) return texObj->_MipmapComplete; else |