diff options
| author | Eric Anholt <[email protected]> | 2012-01-09 16:41:02 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-01-12 12:34:10 -0800 |
| commit | f83756f80f509fc51030853f8aa0fef3309fe886 (patch) | |
| tree | 15713861ea822a05029e153e6fc84c3d8c1157a9 | |
| parent | e6d6a10c5a2962f93d4adcd251b9a47a4e438121 (diff) | |
meta: Add GL_RED/GL_RG support to meta CopyTexImage.
Fixes some _mesa_problem()s in oglconform.
Reviewed-by: Brian Paul <[email protected]>
NOTE: This is a candidate for the 8.0 branch.
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index abf2f1f35ec..dca3613a610 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -3071,6 +3071,8 @@ get_temp_image_type(struct gl_context *ctx, GLenum baseFormat) switch (baseFormat) { case GL_RGBA: case GL_RGB: + case GL_RG: + case GL_RED: case GL_ALPHA: case GL_LUMINANCE: case GL_LUMINANCE_ALPHA: @@ -3086,7 +3088,8 @@ get_temp_image_type(struct gl_context *ctx, GLenum baseFormat) case GL_DEPTH_STENCIL: return GL_UNSIGNED_INT_24_8; default: - _mesa_problem(ctx, "Unexpected format in get_temp_image_type()"); + _mesa_problem(ctx, "Unexpected format %d in get_temp_image_type()", + baseFormat); return 0; } } |