diff options
| author | Brian Paul <[email protected]> | 2011-12-15 17:33:33 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-12-16 12:13:35 -0700 |
| commit | d842a118b26a56c9c5e4310f30f70199c42ea90e (patch) | |
| tree | e79ec23320683adeb941b5c3fafebd506e60bab8 /src | |
| parent | 45bd5c43ca1f19772f7e1d7abe1c9101ba0f6965 (diff) | |
mesa: make update_fbo_texture() non-static
We'll call this from the mipmap generation code.
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/teximage.c | 11 | ||||
| -rw-r--r-- | src/mesa/main/teximage.h | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 8a002b6755c..eccc0fd39b9 100644 --- a/src/mesa/main/teximage.c +++ b/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; diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h index 9cc7d5a543e..d756646ce26 100644 --- a/src/mesa/main/teximage.h +++ b/src/mesa/main/teximage.h @@ -80,6 +80,10 @@ _mesa_choose_texture_format(struct gl_context *ctx, GLenum target, GLint level, GLenum internalFormat, GLenum format, GLenum type); +extern void +_mesa_update_fbo_texture(struct gl_context *ctx, + struct gl_texture_object *texObj, + GLuint face, GLuint level); extern void _mesa_clear_texture_image(struct gl_context *ctx, |