projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8' into master
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_atom_framebuffer.c
diff --git
a/src/mesa/state_tracker/st_atom_framebuffer.c
b/src/mesa/state_tracker/st_atom_framebuffer.c
index e18c0f6e0a19b42c083600d7f2d1e1b1ac71a255..fba7bfe2cea6d7a81b40fc0a78275341ad03bb94 100644
(file)
--- a/
src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/
src/mesa/state_tracker/st_atom_framebuffer.c
@@
-37,9
+37,10
@@
#include "st_public.h"
#include "st_texture.h"
#include "pipe/p_context.h"
#include "st_public.h"
#include "st_texture.h"
#include "pipe/p_context.h"
-#include "pipe/p_inlines.h"
#include "cso_cache/cso_context.h"
#include "util/u_rect.h"
#include "cso_cache/cso_context.h"
#include "util/u_rect.h"
+#include "util/u_math.h"
+#include "util/u_inlines.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++) {
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);
pipe_surface_reference(&strb->surface, NULL);