*
**************************************************************************/
-
+#include "util/u_bitcast.h"
static boolean TAG(do_cliptest)( struct pt_post_vs *pvs,
- struct draw_vertex_info *info )
+ struct draw_vertex_info *info,
+ const struct draw_prim_info *prim_info )
{
struct vertex_header *out = info->verts;
/* const */ float (*plane)[4] = pvs->draw->plane;
const unsigned cv = draw_current_shader_clipvertex_output(pvs->draw);
unsigned cd[2];
const unsigned ef = pvs->draw->vs.edgeflag_output;
- const unsigned ucp_enable = pvs->draw->rasterizer->clip_plane_enable;
- const unsigned flags = (FLAGS);
+ unsigned ucp_enable = pvs->draw->rasterizer->clip_plane_enable;
+ unsigned flags = (FLAGS);
unsigned need_pipeline = 0;
unsigned j;
unsigned i;
bool have_cd = false;
unsigned viewport_index_output =
draw_current_shader_viewport_index_output(pvs->draw);
-
- cd[0] = draw_current_shader_clipdistance_output(pvs->draw, 0);
- cd[1] = draw_current_shader_clipdistance_output(pvs->draw, 1);
-
+ int viewport_index =
+ draw_current_shader_uses_viewport_index(pvs->draw) ?
+ u_bitcast_f2u(out->data[viewport_index_output][0]): 0;
+ int num_written_clipdistance =
+ draw_current_shader_num_written_clipdistances(pvs->draw);
+
+ cd[0] = draw_current_shader_ccdistance_output(pvs->draw, 0);
+ cd[1] = draw_current_shader_ccdistance_output(pvs->draw, 1);
+
if (cd[0] != pos || cd[1] != pos)
- have_cd = true;
+ have_cd = true;
+
+ /* If clipdistance semantic has been written by the shader
+ * that means we're expected to do 'user plane clipping' */
+ if (num_written_clipdistance && !(flags & DO_CLIP_USER)) {
+ flags |= DO_CLIP_USER;
+ ucp_enable = (1 << num_written_clipdistance) - 1;
+ }
+ assert(pos != -1);
for (j = 0; j < info->count; j++) {
float *position = out->data[pos];
- int viewport_index =
- draw_current_shader_uses_viewport_index(pvs->draw) ?
- *((unsigned*)out->data[viewport_index_output]): 0;
unsigned mask = 0x0;
- const float *scale = pvs->draw->viewports[viewport_index].scale;
- const float *trans = pvs->draw->viewports[viewport_index].translate;
+ float *scale = pvs->draw->viewports[0].scale;
+ float *trans = pvs->draw->viewports[0].translate;
+ if (draw_current_shader_uses_viewport_index(pvs->draw)) {
+ unsigned verts_per_prim = u_vertices_per_prim(prim_info->prim);
+ /* only change the viewport_index for the leading vertex */
+ if (!(j % verts_per_prim)) {
+ viewport_index = u_bitcast_f2u(out->data[viewport_index_output][0]);
+ viewport_index = draw_clamp_viewport_idx(viewport_index);
+ }
+ scale = pvs->draw->viewports[viewport_index].scale;
+ trans = pvs->draw->viewports[viewport_index].translate;
+ }
initialize_vertex_header(out);
DO_CLIP_FULL_Z | DO_CLIP_HALF_Z | DO_CLIP_USER)) {
float *clipvertex = position;
- if ((flags & DO_CLIP_USER) && cv != pos)
+ if ((flags & DO_CLIP_USER) && cv != pos) {
+ assert(cv != -1);
clipvertex = out->data[cv];
+ }
for (i = 0; i < 4; i++) {
- out->clip[i] = clipvertex[i];
- out->pre_clip_pos[i] = position[i];
+ out->clip_pos[i] = position[i];
}
+ /* Be careful with NaNs. Comparisons must be true for them. */
/* Do the hardwired planes first:
*/
if (flags & DO_CLIP_XY_GUARD_BAND) {
- if (-0.50 * position[0] + position[3] < 0) mask |= (1<<0);
- if ( 0.50 * position[0] + position[3] < 0) mask |= (1<<1);
- if (-0.50 * position[1] + position[3] < 0) mask |= (1<<2);
- if ( 0.50 * position[1] + position[3] < 0) mask |= (1<<3);
+ if (!(-0.50 * position[0] + position[3] >= 0)) mask |= (1<<0);
+ if (!( 0.50 * position[0] + position[3] >= 0)) mask |= (1<<1);
+ if (!(-0.50 * position[1] + position[3] >= 0)) mask |= (1<<2);
+ if (!( 0.50 * position[1] + position[3] >= 0)) mask |= (1<<3);
}
else if (flags & DO_CLIP_XY) {
- if (-position[0] + position[3] < 0) mask |= (1<<0);
- if ( position[0] + position[3] < 0) mask |= (1<<1);
- if (-position[1] + position[3] < 0) mask |= (1<<2);
- if ( position[1] + position[3] < 0) mask |= (1<<3);
+ if (!(-position[0] + position[3] >= 0)) mask |= (1<<0);
+ if (!( position[0] + position[3] >= 0)) mask |= (1<<1);
+ if (!(-position[1] + position[3] >= 0)) mask |= (1<<2);
+ if (!( position[1] + position[3] >= 0)) mask |= (1<<3);
}
/* Clip Z planes according to full cube, half cube or none.
*/
if (flags & DO_CLIP_FULL_Z) {
- if ( position[2] + position[3] < 0) mask |= (1<<4);
- if (-position[2] + position[3] < 0) mask |= (1<<5);
+ if (!( position[2] + position[3] >= 0)) mask |= (1<<4);
+ if (!(-position[2] + position[3] >= 0)) mask |= (1<<5);
}
else if (flags & DO_CLIP_HALF_Z) {
- if ( position[2] < 0) mask |= (1<<4);
- if (-position[2] + position[3] < 0) mask |= (1<<5);
+ if (!( position[2] >= 0)) mask |= (1<<4);
+ if (!(-position[2] + position[3] >= 0)) mask |= (1<<5);
}
if (flags & DO_CLIP_USER) {
unsigned ucp_mask = ucp_enable;
- int num_written_clipdistance = pvs->draw->vs.vertex_shader->info.num_written_clipdistance;
+
while (ucp_mask) {
unsigned plane_idx = ffs(ucp_mask)-1;
ucp_mask &= ~(1 << plane_idx);
if (have_cd && num_written_clipdistance) {
float clipdist;
i = plane_idx - 6;
- out->have_clipdist = 1;
/* first four clip distance in first vector etc. */
if (i < 4)
clipdist = out->data[cd[0]][i];
else
clipdist = out->data[cd[1]][i-4];
- if (clipdist < 0)
+ if (clipdist < 0 || util_is_inf_or_nan(clipdist))
mask |= 1 << plane_idx;
} else {
- if (dot4(clipvertex, plane[plane_idx]) < 0)
+ if (!(dot4(clipvertex, plane[plane_idx]) >= 0))
mask |= 1 << plane_idx;
}
}
out = (struct vertex_header *)( (char *)out + info->stride );
}
-
return need_pipeline != 0;
}
projects / mesa.git / blobdiff