projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gallivm: Support 4 x unorm8 in lp_build_fetch_rgba_aos().
[mesa.git]
/
src
/
gallium
/
auxiliary
/
draw
/
draw_pt.c
diff --git
a/src/gallium/auxiliary/draw/draw_pt.c
b/src/gallium/auxiliary/draw/draw_pt.c
index 02c97fec817302fb1650801d373352c508706a7e..6234272d6ce98a334b716111b9535b3e56df4a0e 100644
(file)
--- a/
src/gallium/auxiliary/draw/draw_pt.c
+++ b/
src/gallium/auxiliary/draw/draw_pt.c
@@
-69,7
+69,6
@@
draw_pt_arrays(struct draw_context *draw,
struct draw_pt_front_end *frontend = NULL;
struct draw_pt_middle_end *middle = NULL;
unsigned opt = 0;
struct draw_pt_front_end *frontend = NULL;
struct draw_pt_middle_end *middle = NULL;
unsigned opt = 0;
- unsigned out_prim = prim;
/* Sanitize primitive length:
*/
/* Sanitize primitive length:
*/
@@
-80,18
+79,19
@@
draw_pt_arrays(struct draw_context *draw,
if (count < first)
return TRUE;
}
if (count < first)
return TRUE;
}
- if (draw->gs.geometry_shader) {
- out_prim = draw->gs.geometry_shader->output_primitive;
- }
if (!draw->force_passthrough) {
if (!draw->force_passthrough) {
+ unsigned gs_out_prim = (draw->gs.geometry_shader ?
+ draw->gs.geometry_shader->output_primitive :
+ prim);
+
if (!draw->render) {
opt |= PT_PIPELINE;
}
if (draw_need_pipeline(draw,
draw->rasterizer,
if (!draw->render) {
opt |= PT_PIPELINE;
}
if (draw_need_pipeline(draw,
draw->rasterizer,
- out_prim)) {
+
gs_
out_prim)) {
opt |= PT_PIPELINE;
}
opt |= PT_PIPELINE;
}
@@
-122,7
+122,7
@@
draw_pt_arrays(struct draw_context *draw,
frontend = draw->pt.front.varray;
}
frontend = draw->pt.front.varray;
}
- frontend->prepare( frontend, prim,
out_prim,
middle, opt );
+ frontend->prepare( frontend, prim, middle, opt );
frontend->run(frontend,
draw_pt_elt_func(draw),
frontend->run(frontend,
draw_pt_elt_func(draw),