projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_7_branch'
[mesa.git]
/
src
/
gallium
/
winsys
/
g3dvl
/
xlib
/
xsp_winsys.c
diff --git
a/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
b/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
index b8c8502d7bb19de649152075f625d3967c1b4e26..f15bcd37b501ec11a144b166d955049c93996896 100644
(file)
--- a/
src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
+++ b/
src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
@@
-30,6
+30,7
@@
#include <pipe/internal/p_winsys_screen.h>
#include <pipe/p_state.h>
#include <pipe/p_inlines.h>
#include <pipe/internal/p_winsys_screen.h>
#include <pipe/p_state.h>
#include <pipe/p_inlines.h>
+#include <util/u_format.h>
#include <util/u_memory.h>
#include <util/u_math.h>
#include <softpipe/sp_winsys.h>
#include <util/u_memory.h>
#include <util/u_math.h>
#include <softpipe/sp_winsys.h>
@@
-140,8
+141,8
@@
static struct pipe_buffer* xsp_surface_buffer_create
const unsigned int ALIGNMENT = 1;
unsigned nblocksy;
const unsigned int ALIGNMENT = 1;
unsigned nblocksy;
- nblocksy =
pf
_get_nblocksy(format, height);
- *stride = align(
pf
_get_stride(format, width), ALIGNMENT);
+ nblocksy =
util_format
_get_nblocksy(format, height);
+ *stride = align(
util_format
_get_stride(format, width), ALIGNMENT);
return pws->buffer_create(pws, ALIGNMENT, usage,
*stride * nblocksy);
return pws->buffer_create(pws, ALIGNMENT, usage,
*stride * nblocksy);