fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nouveau: nv30: refuse binding a colour buffer with a zeta buffer with different bits, till the backend can tell Mesa not to do that.

Browse source
This commit is contained in:
Patrice Mandin 2009-10-15 21:58:44 +02:00
parent 108273c5ed
commit 13580aa3d1
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gallium/drivers/nv30/nv30_state_fb.c
View file

@ -15,6 +15,7 @@ nv30_state_framebuffer_validate(struct nv30_context *nv30)
unsigned w = fb->width;
unsigned h = fb->height;
struct nv30_miptree *nv30mt;
int colour_bits = 32, zeta_bits = 32;
rt_enable = 0;
for (i = 0; i < fb->nr_cbufs; i++) {
@ -54,6 +55,7 @@ nv30_state_framebuffer_validate(struct nv30_context *nv30)
break;
case PIPE_FORMAT_R5G6B5_UNORM:
rt_format |= NV34TCL_RT_FORMAT_COLOR_R5G6B5;
colour_bits = 16;
break;
default:
assert(0);
@ -62,6 +64,7 @@ nv30_state_framebuffer_validate(struct nv30_context *nv30)
switch (zeta_format) {
case PIPE_FORMAT_Z16_UNORM:
rt_format |= NV34TCL_RT_FORMAT_ZETA_Z16;
zeta_bits = 16;
break;
case PIPE_FORMAT_Z24S8_UNORM:
case PIPE_FORMAT_Z24X8_UNORM:
@ -72,6 +75,10 @@ nv30_state_framebuffer_validate(struct nv30_context *nv30)
assert(0);
}
if (colour_bits != zeta_bits) {
return FALSE;
}
if (rt_enable & NV34TCL_RT_ENABLE_COLOR0) {
uint32_t pitch = rt[0]->pitch;
if (zeta) {