diff options
| author | Carl Worth <cworth@cworth.org> | 2013-02-19 16:27:16 -0800 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2013-02-21 12:09:24 -0800 |
| commit | f5a8084692a1523f5085a88c22952566506c07de (patch) | |
| tree | bcc8774dce855a7651459faa6249ca31a0419832 /src/mesa/drivers/dri/i965/gen6_cc.c | |
| parent | 2e4ef989a2142c9976be6fe0c6fafeb2bdf4e37d (diff) | |
| download | external_mesa3d-f5a8084692a1523f5085a88c22952566506c07de.zip external_mesa3d-f5a8084692a1523f5085a88c22952566506c07de.tar.gz external_mesa3d-f5a8084692a1523f5085a88c22952566506c07de.tar.bz2 | |
i965: Avoid segfault in gen6_upload_state
This fixes a bug introduced in commit 258453716f001eab1288d99765213 and
triggered whenever "rb" is NULL.
Fixes at least one cause bug #59445:
[SNB/IVB/HSW Bisected]Oglc draw-buffers2(advanced.blending.none) segfault
https://bugs.freedesktop.org/show_bug.cgi?id=59445
(Though segfaults are still possible in that test case, but they have been
present since before commit 258453716f which is what's being fixed here.)
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen6_cc.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_cc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_cc.c b/src/mesa/drivers/dri/i965/gen6_cc.c index d32f636..7ac5d5f 100644 --- a/src/mesa/drivers/dri/i965/gen6_cc.c +++ b/src/mesa/drivers/dri/i965/gen6_cc.c @@ -126,7 +126,7 @@ gen6_upload_blend_state(struct brw_context *brw) * not read the alpha channel, but will instead use the correct * implicit value for alpha. */ - if (!_mesa_base_format_has_channel(rb->_BaseFormat, GL_TEXTURE_ALPHA_TYPE)) + if (rb && !_mesa_base_format_has_channel(rb->_BaseFormat, GL_TEXTURE_ALPHA_TYPE)) { srcRGB = brw_fix_xRGB_alpha(srcRGB); srcA = brw_fix_xRGB_alpha(srcA); |