diff options
| author | Marek Olšák <maraeo@gmail.com> | 2012-10-09 18:18:31 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2012-10-11 21:12:12 +0200 |
| commit | ec4c74a9dc10039d97ad24c4f16bd2400517991d (patch) | |
| tree | 29b260c6136ade3c4ae55fee56f8cabd9fac3b41 /src | |
| parent | 9fe06f88158e2866c5979955214c3af253cabf2a (diff) | |
st/mesa: use the renderbuffer chosen by core Mesa in CopyTexSubImage
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 473ff3a94c5..a5d997efca4 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -915,8 +915,7 @@ st_CopyTexSubImage(struct gl_context *ctx, GLuint dims, { struct st_texture_image *stImage = st_texture_image(texImage); const GLenum texBaseFormat = texImage->_BaseFormat; - struct gl_framebuffer *fb = ctx->ReadBuffer; - struct st_renderbuffer *strb; + struct st_renderbuffer *strb = st_renderbuffer(rb); struct st_context *st = st_context(ctx); struct pipe_context *pipe = st->pipe; struct pipe_screen *screen = pipe->screen; @@ -933,16 +932,6 @@ st_CopyTexSubImage(struct gl_context *ctx, GLuint dims, */ if (0) st_validate_state(st); - /* determine if copying depth or color data */ - if (texBaseFormat == GL_DEPTH_COMPONENT || - texBaseFormat == GL_DEPTH_STENCIL) { - strb = st_renderbuffer(fb->Attachment[BUFFER_DEPTH].Renderbuffer); - } - else { - /* texBaseFormat == GL_RGB, GL_RGBA, GL_ALPHA, etc */ - strb = st_renderbuffer(fb->_ColorReadBuffer); - } - if (!strb || !strb->surface || !stImage->pt) { debug_printf("%s: null strb or stImage\n", __FUNCTION__); return; |