diff options
| author | Nanley Chery <nanley.g.chery@intel.com> | 2015-07-31 09:25:56 -0700 |
|---|---|---|
| committer | Nanley Chery <nanley.g.chery@intel.com> | 2015-08-24 11:27:46 -0700 |
| commit | 9f00af672b59766008994a190730d48ae03773dd (patch) | |
| tree | 7df97076730755923ab358c7f5cae243bfc8e733 /src/mesa/main/mipmap.c | |
| parent | 000e225360c020e8b3de142c4c898baad321d242 (diff) | |
| download | external_mesa3d-9f00af672b59766008994a190730d48ae03773dd.zip external_mesa3d-9f00af672b59766008994a190730d48ae03773dd.tar.gz external_mesa3d-9f00af672b59766008994a190730d48ae03773dd.tar.bz2 | |
mesa/formats: only do type and component lookup for uncompressed formats
Only uncompressed formats have a non-void type and actual
components per pixel. Rename _mesa_format_to_type_and_comps
to _mesa_uncompressed_format_to_type_and_comps and require
callers to check if the format is not compressed.
v2. include compressed format cases to avoid gcc warnings (Chad).
Reviewed-by: Chad Versace <chad.versace@intel.com>
Signed-off-by: Nanley Chery <nanley.g.chery@intel.com>
Diffstat (limited to 'src/mesa/main/mipmap.c')
| -rw-r--r-- | src/mesa/main/mipmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c index 1e22f93..2bf5902 100644 --- a/src/mesa/main/mipmap.c +++ b/src/mesa/main/mipmap.c @@ -1886,7 +1886,7 @@ generate_mipmap_uncompressed(struct gl_context *ctx, GLenum target, GLenum datatype; GLuint comps; - _mesa_format_to_type_and_comps(srcImage->TexFormat, &datatype, &comps); + _mesa_uncompressed_format_to_type_and_comps(srcImage->TexFormat, &datatype, &comps); for (level = texObj->BaseLevel; level < maxLevel; level++) { /* generate image[level+1] from image[level] */ |