projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r600g/compute Improve debugging output
[mesa.git]
/
src
/
gallium
/
drivers
/
softpipe
/
sp_quad_pipe.c
diff --git
a/src/gallium/drivers/softpipe/sp_quad_pipe.c
b/src/gallium/drivers/softpipe/sp_quad_pipe.c
index 43b8e88e334e697c95fcb7d8a0eaa49c9c59e8b8..0c4506ae8f4b3c3690b819c9f1cb8595d1bbec22 100644
(file)
--- a/
src/gallium/drivers/softpipe/sp_quad_pipe.c
+++ b/
src/gallium/drivers/softpipe/sp_quad_pipe.c
@@
-30,9
+30,9
@@
#include "sp_state.h"
#include "pipe/p_shader_tokens.h"
#include "sp_state.h"
#include "pipe/p_shader_tokens.h"
+
static void
static void
-sp_push_quad_first( struct softpipe_context *sp,
- struct quad_stage *quad )
+insert_stage_at_head(struct softpipe_context *sp, struct quad_stage *quad)
{
quad->next = sp->quad.first;
sp->quad.first = quad;
{
quad->next = sp->quad.first;
sp->quad.first = quad;
@@
-46,23
+46,24
@@
sp_build_quad_pipeline(struct softpipe_context *sp)
sp->depth_stencil->depth.enabled &&
sp->framebuffer.zsbuf &&
!sp->depth_stencil->alpha.enabled &&
sp->depth_stencil->depth.enabled &&
sp->framebuffer.zsbuf &&
!sp->depth_stencil->alpha.enabled &&
- !sp->fs->info.uses_kill &&
- !sp->fs->info.writes_z;
+ !sp->fs_variant->info.uses_kill &&
+ !sp->fs_variant->info.writes_z &&
+ !sp->fs_variant->info.writes_stencil;
sp->quad.first = sp->quad.blend;
if (early_depth_test) {
sp->quad.first = sp->quad.blend;
if (early_depth_test) {
-
sp_push_quad_first
( sp, sp->quad.shade );
-
sp_push_quad_first
( sp, sp->quad.depth_test );
+
insert_stage_at_head
( sp, sp->quad.shade );
+
insert_stage_at_head
( sp, sp->quad.depth_test );
}
else {
}
else {
-
sp_push_quad_first
( sp, sp->quad.depth_test );
-
sp_push_quad_first
( sp, sp->quad.shade );
+
insert_stage_at_head
( sp, sp->quad.depth_test );
+
insert_stage_at_head
( sp, sp->quad.shade );
}
}
-#if !DO_PSTIPPLE_IN_DRAW_MODULE
+#if !DO_PSTIPPLE_IN_DRAW_MODULE
&& !DO_PSTIPPLE_IN_HELPER_MODULE
if (sp->rasterizer->poly_stipple_enable)
if (sp->rasterizer->poly_stipple_enable)
-
sp_push_quad_first
( sp, sp->quad.pstipple );
+
insert_stage_at_head
( sp, sp->quad.pstipple );
#endif
}
#endif
}