From: Alan Hourihane <alanh@vmware.com>
Date: Thu, 15 Jan 2009 11:54:41 +0000 (+0000)
Subject: mesa: small cleanup
X-Git-Tag: mesa-7.8~4139^2~496^2~115^2~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bfbb57790a06bb03e9bf3237b7f8756a67702192;p=platform%2Fupstream%2Fmesa.git

mesa: small cleanup
---

diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 45a0542..7fdc5d9 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -354,12 +354,14 @@ st_render_texture(GLcontext *ctx,
 {
    struct st_renderbuffer *strb;
    struct gl_renderbuffer *rb;
-   struct pipe_texture *pt;
+   struct pipe_texture *pt = st_get_texobj_texture(att->Texture);
    struct st_texture_object *stObj;
    const struct gl_texture_image *texImage =
       att->Texture->Image[att->CubeMapFace][att->TextureLevel];
 
 
+   if (!pt) return;
+
    assert(!att->Renderbuffer);
 
    /* create new renderbuffer which wraps the texture image */
@@ -387,7 +389,7 @@ st_render_texture(GLcontext *ctx,
    rb->Height = texImage->Height2;
    /*printf("***** render to texture level %d: %d x %d\n", att->TextureLevel, rb->Width, rb->Height);*/
 
-   pt = st_get_texobj_texture(att->Texture);
+   /*printf("***** pipe texture %d x %d\n", pt->width[0], pt->height[0]);*/
 
    pipe_texture_reference( &strb->texture, pt );
 
@@ -395,10 +397,7 @@ st_render_texture(GLcontext *ctx,
 
    /* the new surface will be created during framebuffer validation */
 
-   if (pt) {
-      /*printf("***** pipe texture %d x %d\n", pt->width[0], pt->height[0]);*/
-      init_renderbuffer_bits(strb, pt->format);
-   }
+   init_renderbuffer_bits(strb, pt->format);
 
    /*
    printf("RENDER TO TEXTURE obj=%p pt=%p surf=%p  %d x %d\n",