fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300g: replace r300_get_num_samples with a util variant

Browse source
This commit is contained in:
Marek Olšák 2014-10-20 15:41:42 +02:00
parent 013850a1b7
commit 22c5886f3f
1 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/gallium/drivers/r300/r300_state.c
View file

@ -942,30 +942,6 @@ void r300_mark_fb_state_dirty(struct r300_context *r300,
/* The size of the rest of atoms stays the same. */
}
static unsigned r300_get_num_samples(struct r300_context *r300)
{
struct pipe_framebuffer_state* fb =
(struct pipe_framebuffer_state*)r300->fb_state.state;
unsigned i, num_samples;
if (!fb->nr_cbufs && !fb->zsbuf)
return 1;
num_samples = 6;
for (i = 0; i < fb->nr_cbufs; i++)
if (fb->cbufs[i])
num_samples = MIN2(num_samples, fb->cbufs[i]->texture->nr_samples);
if (fb->zsbuf)
num_samples = MIN2(num_samples, fb->zsbuf->texture->nr_samples);
if (!num_samples)
num_samples = 1;
return num_samples;
}
static void
r300_set_framebuffer_state(struct pipe_context* pipe,
const struct pipe_framebuffer_state* state)
@ -1073,7 +1049,7 @@ r300_set_framebuffer_state(struct pipe_context* pipe,
}
}
r300->num_samples = r300_get_num_samples(r300);
r300->num_samples = util_framebuffer_get_num_samples(state);
/* Set up AA config. */
if (r300->num_samples > 1) {