On Sat, Aug 22, 2009 at 1:52 AM, Luo Jinghua<[email protected]> wrote: > Fix assertion in nv04_surface_fill() and glxgears works on nv40 again. > --- > src/gallium/drivers/nv04/nv04_surface_2d.c | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/src/gallium/drivers/nv04/nv04_surface_2d.c > b/src/gallium/drivers/nv04/nv04_surface_2d.c > index bbbcb54..c107eb9 100644 > --- a/src/gallium/drivers/nv04/nv04_surface_2d.c > +++ b/src/gallium/drivers/nv04/nv04_surface_2d.c > @@ -15,11 +15,13 @@ nv04_surface_format(enum pipe_format format) > return NV04_CONTEXT_SURFACES_2D_FORMAT_Y8; > case PIPE_FORMAT_R16_SNORM: > case PIPE_FORMAT_R5G6B5_UNORM: > + case PIPE_FORMAT_Z16_UNORM: > return NV04_CONTEXT_SURFACES_2D_FORMAT_R5G6B5; > case PIPE_FORMAT_X8R8G8B8_UNORM: > case PIPE_FORMAT_A8R8G8B8_UNORM: > return NV04_CONTEXT_SURFACES_2D_FORMAT_A8R8G8B8; > case PIPE_FORMAT_Z24S8_UNORM: > + case PIPE_FORMAT_Z24X8_UNORM: > return NV04_CONTEXT_SURFACES_2D_FORMAT_Y32; > default: > return -1; > @@ -34,8 +36,11 @@ nv04_rect_format(enum pipe_format format) > return NV04_GDI_RECTANGLE_TEXT_COLOR_FORMAT_A8R8G8B8; > case PIPE_FORMAT_R5G6B5_UNORM: > return NV04_GDI_RECTANGLE_TEXT_COLOR_FORMAT_A16R5G6B5; > + case PIPE_FORMAT_Z16_UNORM: > + return NV04_GDI_RECTANGLE_TEXT_COLOR_FORMAT_A16R5G6B5; > case PIPE_FORMAT_A8R8G8B8_UNORM: > case PIPE_FORMAT_Z24S8_UNORM: > + case PIPE_FORMAT_Z24X8_UNORM: > return NV04_GDI_RECTANGLE_TEXT_COLOR_FORMAT_A8R8G8B8; > default: > return -1; > -- > 1.6.4 > >
Thanks, looks good. We started returning true in is_format_supported() for those Z formats but missed this part evidently. I'll apply it when I get home if noone else beats me to it. ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Mesa3d-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
