OSDN Git Service

i965: Instead of fallback on missing region, just bind a null renderbuffer.
authorEric Anholt <eric@anholt.net>
Fri, 13 May 2011 04:05:30 +0000 (21:05 -0700)
committerKenneth Graunke <kenneth@whitecape.org>
Wed, 18 May 2011 06:48:17 +0000 (23:48 -0700)
commit4e98318fc1722171a07d867a99ab7608ecf758cd
treeb96aa52eeef320f3b8e93a8d1816bb9c160a64e0
parent461e193971db4ac456be0d383e9aebf15868542a
i965: Instead of fallback on missing region, just bind a null renderbuffer.

The change for GPU hanging in 13bab58f04c1ec6d0d52760eab490a0997d9abe2
fell back even when rb == NULL, which is wrong for GLES2 and caused
segfaulting in GLES2 conformance.  For the GPU hang case (where the
broken 2D driver failed to allocate a BO for the window system
renderbuffer), it also would assertion fail/segfault immediately after
the fallback setup when the renderbuffer map failed.

Fixes GLES2 conformance packed_depth_stencil.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/drivers/dri/i965/gen7_wm_surface_state.c