diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-12 11:22:24 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-12 11:22:24 +0100 |
| commit | f1b679a372274041aa3e7a02f979390b17eb1ab5 (patch) | |
| tree | f5bad38b25c1e5bf69cb06b4236cccb4310f769f /mesalib/src/glsl | |
| parent | 3ef320ddf5d23b4e69cc7d44a17f902e245f6426 (diff) | |
| parent | b73c544c61712f7bd57f3c9a0f6046481f58038b (diff) | |
| download | vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.tar.gz vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.tar.bz2 vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman mesa fontconfig git update 12 nov 2013
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
Diffstat (limited to 'mesalib/src/glsl')
| -rw-r--r-- | mesalib/src/glsl/opt_cse.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/glsl/opt_cse.cpp b/mesalib/src/glsl/opt_cse.cpp index c0fdb23e6..c53b4c6e7 100644 --- a/mesalib/src/glsl/opt_cse.cpp +++ b/mesalib/src/glsl/opt_cse.cpp @@ -352,6 +352,7 @@ equals(ir_texture *a, ir_texture *b) if (!equals(a->lod_info.grad.dPdx, b->lod_info.grad.dPdx) || !equals(a->lod_info.grad.dPdy, b->lod_info.grad.dPdy)) return false; + break; case ir_txf_ms: if (!equals(a->lod_info.sample_index, b->lod_info.sample_index)) return false; @@ -359,6 +360,7 @@ equals(ir_texture *a, ir_texture *b) case ir_tg4: if (!equals(a->lod_info.component, b->lod_info.component)) return false; + break; default: assert(!"Unrecognized texture op"); } |