diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-29 20:46:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-29 20:46:21 +0200 |
| commit | 816a5430313e07083c5325f0a430126a2e10ec41 (patch) | |
| tree | 82e47992f52149b83238690062e0c56202cb2ebb /mesalib/src/mesa/drivers/common/meta.h | |
| parent | c2dfa0e8c98b06e050c530d704d75a7e4edad02e (diff) | |
| download | vcxsrv-816a5430313e07083c5325f0a430126a2e10ec41.tar.gz vcxsrv-816a5430313e07083c5325f0a430126a2e10ec41.tar.bz2 vcxsrv-816a5430313e07083c5325f0a430126a2e10ec41.zip | |
mesa xkeyboard-config git update 29 Mar 2014
xkeyboard-config commit bc3ac1b0d152e929b3532a541596cf9fe286bb9e
mesa commit dfd117b8570a69a429e660c069997e78b181ab6d
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 |