aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-09-23 09:49:27 +0200
committermarha <marha@users.sourceforge.net>2013-09-23 09:49:27 +0200
commitb299d73bb416e2a26a642a54d5a15ea9fa30df33 (patch)
tree4cff827d4348e99d516ee2f1051f92ad5fa3ef8d /mesalib/src/mesa/program
parenta5179a42a3376f0d8c1d01456235b044854d8bdc (diff)
parente4d5a2996e4a03f55bc7d21c493ba1bcbef35aae (diff)
downloadvcxsrv-b299d73bb416e2a26a642a54d5a15ea9fa30df33.tar.gz
vcxsrv-b299d73bb416e2a26a642a54d5a15ea9fa30df33.tar.bz2
vcxsrv-b299d73bb416e2a26a642a54d5a15ea9fa30df33.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa xserver git update 23 Sep 2013 Conflicts: mesalib/src/glsl/ast.h mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/glsl_symbol_table.cpp mesalib/src/glsl/ir_constant_expression.cpp mesalib/src/glsl/list.h
Diffstat (limited to 'mesalib/src/mesa/program')
-rw-r--r--mesalib/src/mesa/program/ir_to_mesa.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp
index cef32dc07..c46a3d005 100644
--- a/mesalib/src/mesa/program/ir_to_mesa.cpp
+++ b/mesalib/src/mesa/program/ir_to_mesa.cpp
@@ -149,17 +149,7 @@ dst_reg::dst_reg(src_reg reg)
class ir_to_mesa_instruction : public exec_node {
public:
- /* Callers of this ralloc-based new need not call delete. It's
- * easier to just ralloc_free 'ctx' (or any of its ancestors). */
- static void* operator new(size_t size, void *ctx)
- {
- void *node;
-
- node = rzalloc_size(ctx, size);
- assert(node != NULL);
-
- return node;
- }
+ DECLARE_RZALLOC_CXX_OPERATORS(ir_to_mesa_instruction)
enum prog_opcode op;
dst_reg dst;