diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-17 13:46:47 +0100 |
|---|---|---|
| committer | Marc Haesen <marc@hc-consult.be> | 2011-12-17 13:46:47 +0100 |
| commit | cd55591be471b59faf9693651837a61e8376d85a (patch) | |
| tree | daa8bcdb500384d7112f5114bf9c11b0bc2ab78d /mesalib/src/mesa/main/teximage.c | |
| parent | 1ae4005bfe3690b34ec40e33918b3e24468d47e1 (diff) | |
| parent | abacebe06d9f3d2fe1b7d256bd86cddbfa592a85 (diff) | |
| download | vcxsrv-cd55591be471b59faf9693651837a61e8376d85a.tar.gz vcxsrv-cd55591be471b59faf9693651837a61e8376d85a.tar.bz2 vcxsrv-cd55591be471b59faf9693651837a61e8376d85a.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/teximage.c')
| -rw-r--r-- | mesalib/src/mesa/main/teximage.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index 8a002b675..eccc0fd39 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -2205,9 +2205,10 @@ check_rtt_cb(GLuint key, void *data, void *userData) * in size or format since that effects FBO completeness. * Any FBOs rendering into the texture must be re-validated. */ -static void -update_fbo_texture(struct gl_context *ctx, struct gl_texture_object *texObj, - GLuint face, GLuint level) +void +_mesa_update_fbo_texture(struct gl_context *ctx, + struct gl_texture_object *texObj, + GLuint face, GLuint level) { /* Only check this texture if it's been marked as RenderToTexture */ if (texObj->_RenderToTexture) { @@ -2502,7 +2503,7 @@ teximage(struct gl_context *ctx, GLuint dims, check_gen_mipmap(ctx, target, texObj, level); - update_fbo_texture(ctx, texObj, face, level); + _mesa_update_fbo_texture(ctx, texObj, face, level); /* state update */ texObj->_Complete = GL_FALSE; @@ -2844,7 +2845,7 @@ copyteximage(struct gl_context *ctx, GLuint dims, check_gen_mipmap(ctx, target, texObj, level); - update_fbo_texture(ctx, texObj, face, level); + _mesa_update_fbo_texture(ctx, texObj, face, level); /* state update */ texObj->_Complete = GL_FALSE; |