diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-12 08:07:50 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-12 08:07:50 +0100 |
| commit | b73c544c61712f7bd57f3c9a0f6046481f58038b (patch) | |
| tree | f5f70891559c93ecdc95ff9532fcebf747cb7952 /mesalib/src | |
| parent | 09e94a8e392e8fe6fd89ddefbf3897a92e525b5b (diff) | |
| download | vcxsrv-b73c544c61712f7bd57f3c9a0f6046481f58038b.tar.gz vcxsrv-b73c544c61712f7bd57f3c9a0f6046481f58038b.tar.bz2 vcxsrv-b73c544c61712f7bd57f3c9a0f6046481f58038b.zip | |
pixman mesa fontconfig git update 12 nov 2013
pixman commit 741007311087be8a711cc9c76ec00e59a156c850
fontconfig commit 38acb08d9778ebad2bfc3407532adf8f2e8e667e
mesa commit 594fa4a208b138b0b9b24cc8de62e6681ebb8d21
Diffstat (limited to 'mesalib/src')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_framebuffer.c | 3 | ||||
| -rw-r--r-- | mesalib/src/glsl/opt_cse.cpp | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/swrast/swrast.c | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_framebuffer.c b/mesalib/src/gallium/auxiliary/util/u_framebuffer.c index 7803ec6a8..f84485d1f 100644 --- a/mesalib/src/gallium/auxiliary/util/u_framebuffer.c +++ b/mesalib/src/gallium/auxiliary/util/u_framebuffer.c @@ -88,7 +88,8 @@ util_copy_framebuffer_state(struct pipe_framebuffer_state *dst, for (i = 0; i < src->nr_cbufs; i++) pipe_surface_reference(&dst->cbufs[i], src->cbufs[i]); - for (i = src->nr_cbufs; i < dst->nr_cbufs; i++) + /* Set remaining dest cbuf pointers to NULL */ + for ( ; i < Elements(dst->cbufs); i++) pipe_surface_reference(&dst->cbufs[i], NULL); dst->nr_cbufs = src->nr_cbufs; 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"); } diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c index bfa2efd21..c062071b0 100644 --- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c +++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c @@ -664,6 +664,7 @@ dri_create_context(gl_api api, unsigned major_version, unsigned minor_version, uint32_t flags, + bool notify_reset, unsigned *error, void *sharedContextPrivate) { |