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

nv30: init zeta to NULL, use color pitch if no zeta

Browse source
This commit is contained in:
Patrice Mandin 2008-02-22 22:21:15 +01:00
parent 0a5ed0667e
commit d8a9d850b9
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gallium/drivers/nv30/nv30_state.c
View file

@ -537,7 +537,7 @@ nv30_set_framebuffer_state(struct pipe_context *pipe,
const struct pipe_framebuffer_state *fb) const struct pipe_framebuffer_state *fb)
{ {
struct nv30_context *nv30 = nv30_context(pipe); struct nv30_context *nv30 = nv30_context(pipe);
struct pipe_surface *rt[4], *zeta; struct pipe_surface *rt[4], *zeta = NULL;
uint32_t rt_enable, rt_format, w, h; uint32_t rt_enable, rt_format, w, h;
int i, colour_format = 0, zeta_format = 0; int i, colour_format = 0, zeta_format = 0;
@ -603,8 +603,15 @@ nv30_set_framebuffer_state(struct pipe_context *pipe,
} }
if (rt_enable & NV34TCL_RT_ENABLE_COLOR0) { if (rt_enable & NV34TCL_RT_ENABLE_COLOR0) {
uint32_t pitch = rt[0]->pitch * rt[0]->cpp;
if (zeta) {
pitch |= (zeta->pitch * zeta->cpp)<<16;
} else {
pitch |= pitch<<16;
}
BEGIN_RING(rankine, NV34TCL_COLOR0_PITCH, 1); BEGIN_RING(rankine, NV34TCL_COLOR0_PITCH, 1);
OUT_RING ( (rt[0]->pitch * rt[0]->cpp) | ( (zeta->pitch * zeta->cpp) << 16) ); OUT_RING ( pitch );
nv30->rt[0] = rt[0]->buffer; nv30->rt[0] = rt[0]->buffer;
} }