diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2009-11-27 17:15:47 +0100 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2009-11-27 17:15:47 +0100 |
| commit | c95cbd45c657ac47e908a4d99d118737034bde43 (patch) | |
| tree | 68e6c2b91f97fadbe4dd073b9f7acaf5ee8d79cf /src/mesa/state_tracker/st_atom_framebuffer.c | |
| parent | 884007546c98b1779bf266ec5111b1e7e2b68b2e (diff) | |
| parent | d509f84543d0979e9bb53c20c195f378dd61e728 (diff) | |
Merge branch 'width0'
Conflicts:
src/gallium/drivers/r300/r300_texture.c
src/gallium/state_trackers/xorg/xorg_exa.c
src/mesa/state_tracker/st_cb_texture.c
Diffstat (limited to 'src/mesa/state_tracker/st_atom_framebuffer.c')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_framebuffer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_atom_framebuffer.c b/src/mesa/state_tracker/st_atom_framebuffer.c index e18c0f6e0a..8ca4335e33 100644 --- a/src/mesa/state_tracker/st_atom_framebuffer.c +++ b/src/mesa/state_tracker/st_atom_framebuffer.c @@ -40,6 +40,7 @@ #include "pipe/p_inlines.h" #include "cso_cache/cso_context.h" #include "util/u_rect.h" +#include "util/u_math.h" @@ -64,8 +65,8 @@ update_renderbuffer_surface(struct st_context *st, GLuint level; /* find matching mipmap level size */ for (level = 0; level <= texture->last_level; level++) { - if (texture->width[level] == rtt_width && - texture->height[level] == rtt_height) { + if (u_minify(texture->width0, level) == rtt_width && + u_minify(texture->height0, level) == rtt_height) { pipe_surface_reference(&strb->surface, NULL); |