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

Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.1

Browse source
This commit is contained in:
Ben Skeggs 2008-03-02 15:42:53 +11:00
commit a414173105
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
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)
{
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;
int i, colour_format = 0, zeta_format = 0;
@ -603,13 +603,20 @@ nv30_set_framebuffer_state(struct pipe_context *pipe,
}
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);
OUT_RING ( (rt[0]->pitch * rt[0]->cpp) | ( (zeta->pitch * zeta->cpp) << 16) );
OUT_RING ( pitch );
nv30->rt[0] = rt[0]->buffer;
}
if (rt_enable & NV34TCL_RT_ENABLE_COLOR1) {
BEGIN_RING(rankine, NV34TCL_COLOR1_PITCH, 2);
BEGIN_RING(rankine, NV34TCL_COLOR1_PITCH, 1);
OUT_RING (rt[1]->pitch * rt[1]->cpp);
nv30->rt[1] = rt[1]->buffer;
}