projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nouveau: Rename pipe formats.
[mesa.git]
/
src
/
gallium
/
drivers
/
llvmpipe
/
lp_state_surface.c
diff --git
a/src/gallium/drivers/llvmpipe/lp_state_surface.c
b/src/gallium/drivers/llvmpipe/lp_state_surface.c
index 21565436eb6ebbd371e2af61c33eaf627fef0a4a..048ac5b968b315e4d7692602b40beab37aa59150 100644
(file)
--- a/
src/gallium/drivers/llvmpipe/lp_state_surface.c
+++ b/
src/gallium/drivers/llvmpipe/lp_state_surface.c
@@
-29,14
+29,16
@@
*/
#include "pipe/p_state.h"
*/
#include "pipe/p_state.h"
+#include "util/u_inlines.h"
#include "util/u_surface.h"
#include "lp_context.h"
#include "lp_state.h"
#include "util/u_surface.h"
#include "lp_context.h"
#include "lp_state.h"
-#include "lp_surface.h"
#include "lp_setup.h"
#include "draw/draw_context.h"
#include "lp_setup.h"
#include "draw/draw_context.h"
+#include "util/u_format.h"
+
/**
* Set the framebuffer surface info: color buffers, zbuffer, stencil buffer.
/**
* Set the framebuffer surface info: color buffers, zbuffer, stencil buffer.
@@
-57,8
+59,9
@@
llvmpipe_set_framebuffer_state(struct pipe_context *pipe,
if (lp->framebuffer.zsbuf) {
int depth_bits;
double mrd;
if (lp->framebuffer.zsbuf) {
int depth_bits;
double mrd;
- depth_bits = pf_get_component_bits(lp->framebuffer.zsbuf->format,
- PIPE_FORMAT_COMP_Z);
+ depth_bits = util_format_get_component_bits(lp->framebuffer.zsbuf->format,
+ UTIL_FORMAT_COLORSPACE_ZS,
+ 0);
if (depth_bits > 16) {
mrd = 0.0000001;
}
if (depth_bits > 16) {
mrd = 0.0000001;
}
@@
-68,7
+71,7
@@
llvmpipe_set_framebuffer_state(struct pipe_context *pipe,
draw_set_mrd(lp->draw, mrd);
}
draw_set_mrd(lp->draw, mrd);
}
- lp_setup_bind_framebuffer( lp->setup,
fb
);
+ lp_setup_bind_framebuffer( lp->setup,
&lp->framebuffer
);
lp->dirty |= LP_NEW_FRAMEBUFFER;
}
lp->dirty |= LP_NEW_FRAMEBUFFER;
}