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 8ca4335e3307f2e90bf541a197635e6f417a57af..fba7bfe2cea6d7a81b40fc0a78275341ad03bb94 100644
(file)
--- a/
src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/
src/mesa/state_tracker/st_atom_framebuffer.c
@@
-37,10
+37,10
@@
#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 "util/u_math.h"
+#include "util/u_inlines.h"