Mesa (master): gallium: fix merge
Michel Dänzer
daenzer at kemper.freedesktop.org
Wed Feb 18 15:51:10 UTC 2009
Module: Mesa
Branch: master
Commit: 3da38db5949f4c73ec01282ebf9138a0510abbee
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3da38db5949f4c73ec01282ebf9138a0510abbee
Author: Keith Whitwell <keithw at vmware.com>
Date: Mon Feb 16 20:19:40 2009 +0000
gallium: fix merge
It looks like I resolved the merge conflicts but did not save my emacs
buffers before committing...
---
src/mesa/state_tracker/st_cb_accum.c | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/src/mesa/state_tracker/st_cb_accum.c b/src/mesa/state_tracker/st_cb_accum.c
index 33c6488..15cc4cd 100644
--- a/src/mesa/state_tracker/st_cb_accum.c
+++ b/src/mesa/state_tracker/st_cb_accum.c
@@ -227,17 +227,10 @@ accum_accum(struct pipe_context *pipe, GLfloat value,
acc_put_tile_rgba(pipe, acc_trans, 0, 0, width, height, accBuf);
-<<<<<<< HEAD:src/mesa/state_tracker/st_cb_accum.c
- free(colorBuf);
- free(accBuf);
- screen->tex_transfer_release(screen, &acc_trans);
- screen->tex_transfer_release(screen, &color_trans);
-=======
_mesa_free(colorBuf);
_mesa_free(accBuf);
- pipe_surface_reference(&acc_surf, NULL);
- pipe_surface_reference(&color_surf, NULL);
->>>>>>> master:src/mesa/state_tracker/st_cb_accum.c
+ screen->tex_transfer_release(screen, &acc_trans);
+ screen->tex_transfer_release(screen, &color_trans);
}
@@ -270,15 +263,9 @@ accum_load(struct pipe_context *pipe, GLfloat value,
acc_put_tile_rgba(pipe, acc_trans, 0, 0, width, height, buf);
-<<<<<<< HEAD:src/mesa/state_tracker/st_cb_accum.c
- free(buf);
+ _mesa_free(buf);
screen->tex_transfer_release(screen, &acc_trans);
screen->tex_transfer_release(screen, &color_trans);
-=======
- _mesa_free(buf);
- pipe_surface_reference(&acc_surf, NULL);
- pipe_surface_reference(&color_surf, NULL);
->>>>>>> master:src/mesa/state_tracker/st_cb_accum.c
}
@@ -308,13 +295,8 @@ accum_return(GLcontext *ctx, GLfloat value,
acc_get_tile_rgba(pipe, acc_trans, 0, 0, width, height, abuf);
if (!colormask[0] || !colormask[1] || !colormask[2] || !colormask[3]) {
-<<<<<<< HEAD:src/mesa/state_tracker/st_cb_accum.c
- cbuf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
- pipe_get_tile_rgba(color_trans, 0, 0, width, height, cbuf);
-=======
cbuf = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
- pipe_get_tile_rgba(color_surf, xpos, ypos, width, height, cbuf);
->>>>>>> master:src/mesa/state_tracker/st_cb_accum.c
+ pipe_get_tile_rgba(color_trans, 0, 0, width, height, cbuf);
}
for (i = 0; i < width * height; i++) {
@@ -333,15 +315,9 @@ accum_return(GLcontext *ctx, GLfloat value,
_mesa_free(abuf);
if (cbuf)
-<<<<<<< HEAD:src/mesa/state_tracker/st_cb_accum.c
- free(cbuf);
+ _mesa_free(cbuf);
screen->tex_transfer_release(screen, &acc_trans);
screen->tex_transfer_release(screen, &color_trans);
-=======
- _mesa_free(cbuf);
- pipe_surface_reference(&acc_surf, NULL);
- pipe_surface_reference(&color_surf, NULL);
->>>>>>> master:src/mesa/state_tracker/st_cb_accum.c
}
More information about the mesa-commit
mailing list