diff options
| author | Brian Paul <[email protected]> | 2013-01-31 18:49:01 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-02-04 07:58:21 -0700 |
| commit | 478056b81ae80ea3301511fb99b7ba5845202379 (patch) | |
| tree | c68177188553fe402801371f2b59b207e4d862f5 | |
| parent | 44aa2e15f692965be76229e67f919bf967fc7d67 (diff) | |
mesa: don't use format chooser code for glCompressedTexImage
When glCompressedTexImage is called the internalFormat is a specific
format for the incoming image and the the hardware format should be
the same (since we never do format transcoding). So use the simpler
_mesa_glenum_to_compressed_format() function. This change is also
needed for the next patch.
Note: This is a candidate for the stable branches.
| -rw-r--r-- | src/mesa/main/teximage.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index f03e84ad840..ff3c92c5ef1 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -3004,8 +3004,18 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims, texObj = _mesa_get_current_tex_object(ctx, target); assert(texObj); - texFormat = _mesa_choose_texture_format(ctx, texObj, target, level, - internalFormat, format, type); + if (compressed) { + /* For glCompressedTexImage() the driver has no choice about the + * texture format since we'll never transcode the user's compressed + * image data. The internalFormat was error checked earlier. + */ + texFormat = _mesa_glenum_to_compressed_format(internalFormat); + } + else { + texFormat = _mesa_choose_texture_format(ctx, texObj, target, level, + internalFormat, format, type); + } + assert(texFormat != MESA_FORMAT_NONE); /* check that width, height, depth are legal for the mipmap level */ |