svn merge ^/branches/released .

3 files changed, 15 insertions, 3 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_context.c b/mesalib/src/mesa/state_tracker/st_context.c
index 593da8fa6..b16d965f8 100644
--- a/mesalib/src/mesa/state_tracker/st_context.c
+++ b/mesalib/src/mesa/state_tracker/st_context.c
@@ -178,7 +178,7 @@ struct st_context *st_create_context(gl_api api, struct pipe_context *pipe,
    memset(&funcs, 0, sizeof(funcs));

    st_init_driver_functions(&funcs);

 

-   ctx = _mesa_create_context_for_api(api, visual, shareCtx, &funcs, NULL);

+   ctx = _mesa_create_context(api, visual, shareCtx, &funcs, NULL);

 

    /* XXX: need a capability bit in gallium to query if the pipe

     * driver prefers DP4 or MUL/MAD for vertex transformation.

diff --git a/mesalib/src/mesa/state_tracker/st_draw_feedback.c b/mesalib/src/mesa/state_tracker/st_draw_feedback.c
index 72ed75e73..b694be04f 100644
--- a/mesalib/src/mesa/state_tracker/st_draw_feedback.c
+++ b/mesalib/src/mesa/state_tracker/st_draw_feedback.c
@@ -261,6 +261,7 @@ st_feedback_draw_vbo(struct gl_context *ctx,
          pipe_buffer_unmap(pipe, vb_transfer[i]);

          pipe_resource_reference(&draw->pt.vertex_buffer[i].buffer, NULL);

          draw_set_mapped_vertex_buffer(draw, i, NULL);

+         pipe_resource_reference(&vbuffers[i].buffer, NULL);

       }

    }

 

diff --git a/mesalib/src/mesa/state_tracker/st_program.c b/mesalib/src/mesa/state_tracker/st_program.c
index f70e5005f..e5c26c563 100644
--- a/mesalib/src/mesa/state_tracker/st_program.c
+++ b/mesalib/src/mesa/state_tracker/st_program.c
@@ -108,6 +108,8 @@ delete_fp_variant(struct st_context *st, struct st_fp_variant *fpv)
 {

    if (fpv->driver_shader) 

       cso_delete_fragment_shader(st->cso_context, fpv->driver_shader);

+   if (fpv->parameters)

+      _mesa_free_parameter_list(fpv->parameters);

       

    FREE(fpv);

 }

@@ -404,6 +406,7 @@ st_translate_fragment_program(struct st_context *st,
 {

    struct pipe_context *pipe = st->pipe;

    struct st_fp_variant *variant = CALLOC_STRUCT(st_fp_variant);

+   GLboolean deleteFP = GL_FALSE;

 

    if (!variant)

       return NULL;

@@ -413,17 +416,18 @@ st_translate_fragment_program(struct st_context *st,
 #if FEATURE_drawpix

    if (key->bitmap) {

       /* glBitmap drawing */

-      struct gl_fragment_program *fp;

+      struct gl_fragment_program *fp; /* we free this temp program below */

 

       st_make_bitmap_fragment_program(st, &stfp->Base,

                                       &fp, &variant->bitmap_sampler);

 

       variant->parameters = _mesa_clone_parameter_list(fp->Base.Parameters);

       stfp = st_fragment_program(fp);

+      deleteFP = GL_TRUE;

    }

    else if (key->drawpixels) {

       /* glDrawPixels drawing */

-      struct gl_fragment_program *fp;

+      struct gl_fragment_program *fp; /* we free this temp program below */

 

       if (key->drawpixels_z || key->drawpixels_stencil) {

          fp = st_make_drawpix_z_stencil_program(st, key->drawpixels_z,

@@ -433,6 +437,7 @@ st_translate_fragment_program(struct st_context *st,
          /* RGBA */

          st_make_drawpix_fragment_program(st, &stfp->Base, &fp);

          variant->parameters = _mesa_clone_parameter_list(fp->Base.Parameters);

+         deleteFP = GL_TRUE;

       }

       stfp = st_fragment_program(fp);

    }

@@ -630,6 +635,12 @@ st_translate_fragment_program(struct st_context *st,
       debug_printf("\n");

    }

 

+   if (deleteFP) {

+      /* Free the temporary program made above */

+      struct gl_fragment_program *fp = &stfp->Base;

+      _mesa_reference_fragprog(st->ctx, &fp, NULL);

+   }

+

    return variant;

 }