diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-18 08:09:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-18 08:09:44 +0200 |
| commit | 09bfe74fc7d4a6f97eddb034df371e66e314ea12 (patch) | |
| tree | b63caf666a8c36ddcc9a4202f7cecac49998e98d /mesalib/src/glsl/ir.h | |
| parent | 5a54fa6e45ee10cf58ee1b6d2eb5522a24bb8745 (diff) | |
| parent | 7f669a708bd35bdf8e842f762ec68f9ad0ec0486 (diff) | |
| download | vcxsrv-09bfe74fc7d4a6f97eddb034df371e66e314ea12.tar.gz vcxsrv-09bfe74fc7d4a6f97eddb034df371e66e314ea12.tar.bz2 vcxsrv-09bfe74fc7d4a6f97eddb034df371e66e314ea12.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa pixman xserver git update 18 Sep 2013
Conflicts:
pixman/pixman/pixman-sse2.c
Diffstat (limited to 'mesalib/src/glsl/ir.h')
| -rw-r--r-- | mesalib/src/glsl/ir.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h index 2637b40e2..6c5630b09 100644 --- a/mesalib/src/glsl/ir.h +++ b/mesalib/src/glsl/ir.h @@ -1175,6 +1175,13 @@ enum ir_expression_operation { ir_binop_ubo_load, /** + * \name Multiplies a number by two to a power, part of ARB_gpu_shader5. + */ + /*@{*/ + ir_binop_ldexp, + /*@}*/ + + /** * Extract a scalar from a vector * * operand0 is the vector @@ -1915,10 +1922,10 @@ union ir_constant_data { class ir_constant : public ir_rvalue { public: ir_constant(const struct glsl_type *type, const ir_constant_data *data); - ir_constant(bool b); - ir_constant(unsigned int u); - ir_constant(int i); - ir_constant(float f); + ir_constant(bool b, unsigned vector_elements=1); + ir_constant(unsigned int u, unsigned vector_elements=1); + ir_constant(int i, unsigned vector_elements=1); + ir_constant(float f, unsigned vector_elements=1); /** * Construct an ir_constant from a list of ir_constant values |