projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gallivm: cleanup the gs interface
[mesa.git]
/
src
/
gallium
/
auxiliary
/
draw
/
draw_pipe_validate.c
diff --git
a/src/gallium/auxiliary/draw/draw_pipe_validate.c
b/src/gallium/auxiliary/draw/draw_pipe_validate.c
index 03e842ce082bc49a663f46289a917bcf04575b94..4b0ed148129f2c3a01c2a1bf4fd918c9db57b4a2 100644
(file)
--- a/
src/gallium/auxiliary/draw/draw_pipe_validate.c
+++ b/
src/gallium/auxiliary/draw/draw_pipe_validate.c
@@
-29,6
+29,7
@@
*/
#include "util/u_memory.h"
*/
#include "util/u_memory.h"
+#include "util/u_math.h"
#include "pipe/p_defines.h"
#include "draw_private.h"
#include "draw_pipe.h"
#include "pipe/p_defines.h"
#include "draw_private.h"
#include "draw_pipe.h"
@@
-86,7
+87,7
@@
draw_need_pipeline(const struct draw_context *draw,
return TRUE;
/* wide lines */
return TRUE;
/* wide lines */
- if (r
asterizer->line_width
> draw->pipeline.wide_line_threshold)
+ if (r
oundf(rasterizer->line_width)
> draw->pipeline.wide_line_threshold)
return TRUE;
/* AA lines */
return TRUE;
/* AA lines */
@@
-100,12
+101,17
@@
draw_need_pipeline(const struct draw_context *draw,
if (rasterizer->point_size > draw->pipeline.wide_point_threshold)
return TRUE;
if (rasterizer->point_size > draw->pipeline.wide_point_threshold)
return TRUE;
+ /* sprite points */
+ if (rasterizer->point_quad_rasterization
+ && draw->pipeline.wide_point_sprites)
+ return TRUE;
+
/* AA points */
if (rasterizer->point_smooth && draw->pipeline.aapoint)
return TRUE;
/* point sprites */
/* AA points */
if (rasterizer->point_smooth && draw->pipeline.aapoint)
return TRUE;
/* point sprites */
- if (rasterizer->
point_sprit
e && draw->pipeline.point_sprite)
+ if (rasterizer->
sprite_coord_enabl
e && draw->pipeline.point_sprite)
return TRUE;
}
return TRUE;
}
@@
-117,12
+123,14
@@
draw_need_pipeline(const struct draw_context *draw,
return TRUE;
/* unfilled polygons */
return TRUE;
/* unfilled polygons */
- if (rasterizer->fill_
cw
!= PIPE_POLYGON_MODE_FILL ||
- rasterizer->fill_
ccw
!= PIPE_POLYGON_MODE_FILL)
+ if (rasterizer->fill_
front
!= PIPE_POLYGON_MODE_FILL ||
+ rasterizer->fill_
back
!= PIPE_POLYGON_MODE_FILL)
return TRUE;
/* polygon offset */
return TRUE;
/* polygon offset */
- if (rasterizer->offset_cw || rasterizer->offset_ccw)
+ if (rasterizer->offset_point ||
+ rasterizer->offset_line ||
+ rasterizer->offset_tri)
return TRUE;
/* two-side lighting */
return TRUE;
/* two-side lighting */
@@
-151,9
+159,10
@@
static struct draw_stage *validate_pipeline( struct draw_stage *stage )
{
struct draw_context *draw = stage->draw;
struct draw_stage *next = draw->pipeline.rasterize;
{
struct draw_context *draw = stage->draw;
struct draw_stage *next = draw->pipeline.rasterize;
-
int need_det = 0
;
-
int precalc_flat = 0
;
+
boolean need_det = FALSE
;
+
boolean precalc_flat = FALSE
;
boolean wide_lines, wide_points;
boolean wide_lines, wide_points;
+ const struct pipe_rasterizer_state *rast = draw->rasterizer;
/* Set the validate's next stage to the rasterize stage, so that it
* can be found later if needed for flushing.
/* Set the validate's next stage to the rasterize stage, so that it
* can be found later if needed for flushing.
@@
-161,15
+170,17
@@
static struct draw_stage *validate_pipeline( struct draw_stage *stage )
stage->next = next;
/* drawing wide lines? */
stage->next = next;
/* drawing wide lines? */
- wide_lines = (
draw->rasterizer->line_width
> draw->pipeline.wide_line_threshold
- && !
draw->rasterizer
->line_smooth);
+ wide_lines = (
roundf(rast->line_width)
> draw->pipeline.wide_line_threshold
+ && !
rast
->line_smooth);
- /* drawing large
points
? */
- if (
draw->rasterizer->point_sprit
e && draw->pipeline.point_sprite)
+ /* drawing large
/sprite points (but not AA points)
? */
+ if (
rast->sprite_coord_enabl
e && draw->pipeline.point_sprite)
wide_points = TRUE;
wide_points = TRUE;
- else if (
draw->rasterizer
->point_smooth && draw->pipeline.aapoint)
+ else if (
rast
->point_smooth && draw->pipeline.aapoint)
wide_points = FALSE;
wide_points = FALSE;
- else if (draw->rasterizer->point_size > draw->pipeline.wide_point_threshold)
+ else if (rast->point_size > draw->pipeline.wide_point_threshold)
+ wide_points = TRUE;
+ else if (rast->point_quad_rasterization && draw->pipeline.wide_point_sprites)
wide_points = TRUE;
else
wide_points = FALSE;
wide_points = TRUE;
else
wide_points = FALSE;
@@
-181,12
+192,13
@@
static struct draw_stage *validate_pipeline( struct draw_stage *stage )
* shorter pipelines for lines & points.
*/
* shorter pipelines for lines & points.
*/
- if (
draw->rasterizer
->line_smooth && draw->pipeline.aaline) {
+ if (
rast
->line_smooth && draw->pipeline.aaline) {
draw->pipeline.aaline->next = next;
next = draw->pipeline.aaline;
draw->pipeline.aaline->next = next;
next = draw->pipeline.aaline;
+ precalc_flat = TRUE;
}
}
- if (
draw->rasterizer
->point_smooth && draw->pipeline.aapoint) {
+ if (
rast
->point_smooth && draw->pipeline.aapoint) {
draw->pipeline.aapoint->next = next;
next = draw->pipeline.aapoint;
}
draw->pipeline.aapoint->next = next;
next = draw->pipeline.aapoint;
}
@@
-194,50
+206,51
@@
static struct draw_stage *validate_pipeline( struct draw_stage *stage )
if (wide_lines) {
draw->pipeline.wide_line->next = next;
next = draw->pipeline.wide_line;
if (wide_lines) {
draw->pipeline.wide_line->next = next;
next = draw->pipeline.wide_line;
- precalc_flat =
1
;
+ precalc_flat =
TRUE
;
}
}
- if (wide_points
|| draw->rasterizer->point_sprite
) {
+ if (wide_points) {
draw->pipeline.wide_point->next = next;
next = draw->pipeline.wide_point;
}
draw->pipeline.wide_point->next = next;
next = draw->pipeline.wide_point;
}
- if (
draw->rasterizer
->line_stipple_enable && draw->pipeline.line_stipple) {
+ if (
rast
->line_stipple_enable && draw->pipeline.line_stipple) {
draw->pipeline.stipple->next = next;
next = draw->pipeline.stipple;
draw->pipeline.stipple->next = next;
next = draw->pipeline.stipple;
- precalc_flat =
1;
/* only needed for lines really */
+ precalc_flat =
TRUE;
/* only needed for lines really */
}
}
- if (
draw->rasterizer
->poly_stipple_enable
+ if (
rast
->poly_stipple_enable
&& draw->pipeline.pstipple) {
draw->pipeline.pstipple->next = next;
next = draw->pipeline.pstipple;
}
&& draw->pipeline.pstipple) {
draw->pipeline.pstipple->next = next;
next = draw->pipeline.pstipple;
}
- if (
draw->rasterizer->fill_cw
!= PIPE_POLYGON_MODE_FILL ||
-
draw->rasterizer->fill_ccw
!= PIPE_POLYGON_MODE_FILL) {
+ if (
rast->fill_front
!= PIPE_POLYGON_MODE_FILL ||
+
rast->fill_back
!= PIPE_POLYGON_MODE_FILL) {
draw->pipeline.unfilled->next = next;
next = draw->pipeline.unfilled;
draw->pipeline.unfilled->next = next;
next = draw->pipeline.unfilled;
- precalc_flat =
1;
/* only needed for triangles really */
- need_det =
1
;
+ precalc_flat =
TRUE;
/* only needed for triangles really */
+ need_det =
TRUE
;
}
}
- if (
draw->rasterizer
->flatshade && precalc_flat) {
+ if (
rast
->flatshade && precalc_flat) {
draw->pipeline.flatshade->next = next;
next = draw->pipeline.flatshade;
}
draw->pipeline.flatshade->next = next;
next = draw->pipeline.flatshade;
}
- if (draw->rasterizer->offset_cw ||
- draw->rasterizer->offset_ccw) {
+ if (rast->offset_point ||
+ rast->offset_line ||
+ rast->offset_tri) {
draw->pipeline.offset->next = next;
next = draw->pipeline.offset;
draw->pipeline.offset->next = next;
next = draw->pipeline.offset;
- need_det =
1
;
+ need_det =
TRUE
;
}
}
- if (
draw->rasterizer
->light_twoside) {
+ if (
rast
->light_twoside) {
draw->pipeline.twoside->next = next;
next = draw->pipeline.twoside;
draw->pipeline.twoside->next = next;
next = draw->pipeline.twoside;
- need_det =
1
;
+ need_det =
TRUE
;
}
/* Always run the cull stage as we calculate determinant there
}
/* Always run the cull stage as we calculate determinant there
@@
-247,14
+260,14
@@
static struct draw_stage *validate_pipeline( struct draw_stage *stage )
* to less work emitting vertices, smaller vertex buffers, etc.
* It's difficult to say whether this will be true in general.
*/
* to less work emitting vertices, smaller vertex buffers, etc.
* It's difficult to say whether this will be true in general.
*/
- if (need_det ||
draw->rasterizer->cull_mode
) {
+ if (need_det ||
rast->cull_face != PIPE_FACE_NONE
) {
draw->pipeline.cull->next = next;
next = draw->pipeline.cull;
}
/* Clip stage
*/
draw->pipeline.cull->next = next;
next = draw->pipeline.cull;
}
/* Clip stage
*/
- if (
!draw->bypass_clipping
)
+ if (
draw->clip_xy || draw->clip_z || draw->clip_user
)
{
draw->pipeline.clip->next = next;
next = draw->pipeline.clip;
{
draw->pipeline.clip->next = next;
next = draw->pipeline.clip;
@@
-262,7
+275,15
@@
static struct draw_stage *validate_pipeline( struct draw_stage *stage )
draw->pipeline.first = next;
draw->pipeline.first = next;
- return next;
+
+ if (0) {
+ debug_printf("draw pipeline:\n");
+ for (next = draw->pipeline.first; next ; next = next->next )
+ debug_printf(" %s\n", next->name);
+ debug_printf("\n");
+ }
+
+ return draw->pipeline.first;
}
static void validate_tri( struct draw_stage *stage,
}
static void validate_tri( struct draw_stage *stage,
@@
-318,6
+339,7
@@
struct draw_stage *draw_validate_stage( struct draw_context *draw )
return NULL;
stage->draw = draw;
return NULL;
stage->draw = draw;
+ stage->name = "validate";
stage->next = NULL;
stage->point = validate_point;
stage->line = validate_line;
stage->next = NULL;
stage->point = validate_point;
stage->line = validate_line;