diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-05-20 15:12:50 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-05-20 15:12:50 -0600 |
| commit | 8f792a0707446a7b020e6d47a5fff310a36ca81d (patch) | |
| tree | 8a051f4925d955be98a7d6a8fa4ac6a34c71d5bf /src/mesa | |
| parent | cf1ae676ec7cbf3a8595d41fb6b5128ff142b402 (diff) | |
| parent | 7899ecdd6502a323b052f9ad4acd23cbb9ba88db (diff) | |
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_bitmap.c | 4 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_gen_mipmap.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c index c8e2d7d118..3a102df67f 100644 --- a/src/mesa/state_tracker/st_cb_bitmap.c +++ b/src/mesa/state_tracker/st_cb_bitmap.c @@ -198,6 +198,10 @@ combined_bitmap_fragment_program(GLcontext *ctx) _mesa_combine_programs(ctx, &bitmap_prog->Base.Base, &stfp->Base.Base); stfp->bitmap_program->bitmap_sampler = sampler; + + /* done with this after combining */ + st_reference_fragprog(st, &bitmap_prog, NULL); + #if 0 { struct gl_program *p = &stfp->bitmap_program->Base.Base; diff --git a/src/mesa/state_tracker/st_gen_mipmap.c b/src/mesa/state_tracker/st_gen_mipmap.c index cfacfdd04c..f51eff05dc 100644 --- a/src/mesa/state_tracker/st_gen_mipmap.c +++ b/src/mesa/state_tracker/st_gen_mipmap.c @@ -199,6 +199,6 @@ st_generate_mipmap(GLcontext *ctx, GLenum target, dstImage->TexFormat = srcImage->TexFormat; stImage = (struct st_texture_image *) dstImage; - stImage->pt = pt; + pipe_texture_reference(&stImage->pt, pt); } } |