diff options
| author | Chad Versace <[email protected]> | 2012-09-27 11:05:34 -0700 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2012-09-28 05:04:33 -0700 |
| commit | b5891286202987dfc2606ac716050c0ee426de11 (patch) | |
| tree | 7768156bb405c62f6a40015fd74365aa04b914a2 /src/mesa/drivers | |
| parent | d239cb1ccfdf69ff587d5bc74c2174cf51c349b4 (diff) | |
intel: Fix yet-another-bug in intel_texsubimage_tiled_memcpy
The most recent commit that touched this function,
commit b1d0fe022dc4826dadce014ab8fe062a82f75a16
Author: Chad Versace <[email protected]>
Date: Wed Sep 26 11:05:12 2012 -0700
intel: Fix segfault in intel_texsubimage_tiled_memcpy
did fix the segfault, but introduced yet another bug. From Anholt: """You
need to still test format/type, because that's the incoming format (e.g.
GL_RGBA/GL_FLOAT) that you're trying to memcpy."""
This patch re-introduces the checks on the incoming format and type.
Note: This is a candidate for the 9.0 branch.
Reviewed-by: Eric Anholt <[email protected]>
Signed-off-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_subimage.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_subimage.c b/src/mesa/drivers/dri/intel/intel_tex_subimage.c index aa6f237f742..55d0bae2737 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_subimage.c +++ b/src/mesa/drivers/dri/intel/intel_tex_subimage.c @@ -199,6 +199,8 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx, * varying the arithmetic loop below. */ if (!intel->has_llc || + format != GL_BGRA || + type != GL_UNSIGNED_BYTE || texImage->TexFormat != MESA_FORMAT_ARGB8888 || texImage->TexObject->Target != GL_TEXTURE_2D || texImage->Level != 0 || |