diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-04 09:28:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-04 09:28:39 +0100 |
| commit | 23e2767dc3e6b8891d4b55b711c70c6bc85a6f85 (patch) | |
| tree | 04c538697c3afbd401afb1bb614460b16be28844 /mesalib/src/glsl/ir_constant_expression.cpp | |
| parent | 125500b44d0253d7fd7a59905ab730151d4f66e2 (diff) | |
| parent | 02f377d5e2dd18537d0807ad63675a0970b5a37d (diff) | |
| download | vcxsrv-23e2767dc3e6b8891d4b55b711c70c6bc85a6f85.tar.gz vcxsrv-23e2767dc3e6b8891d4b55b711c70c6bc85a6f85.tar.bz2 vcxsrv-23e2767dc3e6b8891d4b55b711c70c6bc85a6f85.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/ddraw.h
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winmonitors.c
xorg-server/hw/xwin/winprocarg.c
xorg-server/hw/xwin/winwin32rootlesswndproc.c
xorg-server/include/scrnintstr.h
xorg-server/xkb/ddxList.c
xorg-server/xkb/ddxLoad.c
Diffstat (limited to 'mesalib/src/glsl/ir_constant_expression.cpp')
| -rw-r--r-- | mesalib/src/glsl/ir_constant_expression.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/ir_constant_expression.cpp b/mesalib/src/glsl/ir_constant_expression.cpp index 83f084d88..492be325f 100644 --- a/mesalib/src/glsl/ir_constant_expression.cpp +++ b/mesalib/src/glsl/ir_constant_expression.cpp @@ -719,7 +719,7 @@ ir_expression::constant_expression_value() } break; case ir_binop_nequal: - assert(op[0]->type != op[1]->type); + assert(op[0]->type == op[1]->type); for (unsigned c = 0; c < components; c++) { switch (op[0]->type->base_type) { case GLSL_TYPE_UINT: |