diff options
| author | Anuj Phogat <[email protected]> | 2014-06-11 18:07:36 -0700 |
|---|---|---|
| committer | Anuj Phogat <[email protected]> | 2014-08-04 17:19:41 -0700 |
| commit | 7de90890c64d019c56e5a06e427b207220729997 (patch) | |
| tree | 7f9fe7a909d51aaa4ecb969dc1f4f3e6d48e442d | |
| parent | 9796a1726545eebb6cf387945cd076bb49de2598 (diff) | |
meta: Use _mesa_get_format_bits() to get the GL_RED_BITS
We currently get red bits from ctx->DrawBuffer->Visual.redBits
by making a false assumption that the texture we're writing to
(in glCopyTexImage2D()) is used as a DrawBuffer.
Fixes many failures in gles3 Khronos CTS test:
copy_tex_image_conversions_required
Cc: <[email protected]>
Signed-off-by: Anuj Phogat <[email protected]>
Reviewed-by: Topi Pohjolainen <[email protected]>
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index a2a7b2d48ff..79fbf4919cb 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -2733,6 +2733,7 @@ static GLenum get_temp_image_type(struct gl_context *ctx, mesa_format format) { const GLenum baseFormat = _mesa_get_format_base_format(format); + const GLint format_red_bits = _mesa_get_format_bits(format, GL_RED_BITS); switch (baseFormat) { case GL_RGBA: @@ -2743,9 +2744,9 @@ get_temp_image_type(struct gl_context *ctx, mesa_format format) case GL_LUMINANCE: case GL_LUMINANCE_ALPHA: case GL_INTENSITY: - if (ctx->DrawBuffer->Visual.redBits <= 8) { + if (format_red_bits <= 8) { return GL_UNSIGNED_BYTE; - } else if (ctx->DrawBuffer->Visual.redBits <= 16) { + } else if (format_red_bits <= 16) { return GL_UNSIGNED_SHORT; } else { GLenum datatype = _mesa_get_format_datatype(format); |