Merge remote-tracking branch 'mesa-public/master' into vulkan

This commit is contained in:
Jason Ekstrand
2015-11-03 15:45:04 -08:00
340 changed files with 16562 additions and 3672 deletions

View File

@@ -83,6 +83,14 @@ BARRIER(discard)
*/
BARRIER(memory_barrier)
/*
* Shader clock intrinsic with semantics analogous to the clock2x32ARB()
* GLSL intrinsic.
* The latter can be used as code motion barrier, which is currently not
* feasible with NIR.
*/
INTRINSIC(shader_clock, 0, ARR(), true, 1, 0, 0, NIR_INTRINSIC_CAN_ELIMINATE)
/** A conditional discard, with a single boolean source. */
INTRINSIC(discard_if, 1, ARR(1), false, 0, 0, 0, 0)
@@ -217,6 +225,10 @@ SYSTEM_VALUE(sample_pos, 2, 0)
SYSTEM_VALUE(sample_mask_in, 1, 0)
SYSTEM_VALUE(primitive_id, 1, 0)
SYSTEM_VALUE(invocation_id, 1, 0)
SYSTEM_VALUE(tess_coord, 3, 0)
SYSTEM_VALUE(tess_level_outer, 4, 0)
SYSTEM_VALUE(tess_level_inner, 2, 0)
SYSTEM_VALUE(patch_vertices_in, 1, 0)
SYSTEM_VALUE(local_invocation_id, 3, 0)
SYSTEM_VALUE(work_group_id, 3, 0)
SYSTEM_VALUE(user_clip_plane, 4, 1) /* const_index[0] is user_clip_plane[idx] */