diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-05 23:40:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-05 23:42:09 +0100 |
| commit | c646056120fe14e4c4ccf81bac5d78d61225a8e8 (patch) | |
| tree | ba0af42750f0ab6dc4724342a7063835636222b5 /mesalib/src/glsl/nir/nir_intrinsics.h | |
| parent | 87e58a93f7248171e736656080069cb65ff56aae (diff) | |
| parent | 8574eba804031f6b19713f0b02952280730bf62e (diff) | |
| download | vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.tar.gz vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.tar.bz2 vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/queryobj.c
Diffstat (limited to 'mesalib/src/glsl/nir/nir_intrinsics.h')
| -rw-r--r-- | mesalib/src/glsl/nir/nir_intrinsics.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/glsl/nir/nir_intrinsics.h b/mesalib/src/glsl/nir/nir_intrinsics.h index d94866c85..3bf102fc1 100644 --- a/mesalib/src/glsl/nir/nir_intrinsics.h +++ b/mesalib/src/glsl/nir/nir_intrinsics.h @@ -68,6 +68,8 @@ INTRINSIC(interp_var_at_offset, 1, ARR(2), true, 0, 1, 0, #define BARRIER(name) INTRINSIC(name, 0, ARR(), false, 0, 0, 0, 0) BARRIER(discard) +/** A conditional discard, with a single boolean source. */ +INTRINSIC(discard_if, 1, ARR(1), false, 0, 0, 0, 0) INTRINSIC(emit_vertex, 0, ARR(), false, 0, 0, 1, 0) INTRINSIC(end_primitive, 0, ARR(), false, 0, 0, 1, 0) |