diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-29 20:50:12 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-29 20:50:12 +0200 |
| commit | aec798fb4dc72d616732d0fa711faffaa8cd7590 (patch) | |
| tree | 2814dfe69e7fb25b57492244d5cfa59d80fc8837 /mesalib/src/mesa/drivers/common/meta.h | |
| parent | 78c6c2b88ae54977a2a617f116a1598657a98b6f (diff) | |
| parent | 816a5430313e07083c5325f0a430126a2e10ec41 (diff) | |
| download | vcxsrv-aec798fb4dc72d616732d0fa711faffaa8cd7590.tar.gz vcxsrv-aec798fb4dc72d616732d0fa711faffaa8cd7590.tar.bz2 vcxsrv-aec798fb4dc72d616732d0fa711faffaa8cd7590.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/drivers/dri/common/dri_util.c
Diffstat (limited to 'mesalib/src/mesa/drivers/common/meta.h')
| -rw-r--r-- | mesalib/src/mesa/drivers/common/meta.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/drivers/common/meta.h b/mesalib/src/mesa/drivers/common/meta.h index 007f1040b..765f8dfe4 100644 --- a/mesalib/src/mesa/drivers/common/meta.h +++ b/mesalib/src/mesa/drivers/common/meta.h @@ -270,7 +270,7 @@ struct blit_state struct fb_tex_blit_state { GLint baseLevelSave, maxLevelSave; - GLuint sampler, samplerSave; + GLuint sampler, samplerSave, stencilSamplingSave; GLuint tempTex; }; @@ -407,7 +407,7 @@ _mesa_meta_fb_tex_blit_begin(const struct gl_context *ctx, struct fb_tex_blit_state *blit); extern void -_mesa_meta_fb_tex_blit_end(const struct gl_context *ctx, GLenum target, +_mesa_meta_fb_tex_blit_end(struct gl_context *ctx, GLenum target, struct fb_tex_blit_state *blit); extern GLboolean |