OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium: need to flush bitmap cache when raster color changes

Browse Source
This commit is contained in:
Brian Paul
2008-06-17 12:20:22 -06:00
parent 93deede760
commit 318f00ae9f
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mesa/state_tracker/st_cb_bitmap.c
View File

@@ -90,6 +90,8 @@ struct bitmap_cache
/** Bounds of region used in window coords */ /** Bounds of region used in window coords */
GLint xmin, ymin, xmax, ymax; GLint xmin, ymin, xmax, ymax;
GLfloat color[4];
struct pipe_texture *texture; struct pipe_texture *texture;
struct pipe_surface *surf; struct pipe_surface *surf;
@@ -429,7 +431,8 @@ setup_bitmap_vertex_data(struct st_context *st,
static void static void
draw_bitmap_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z, draw_bitmap_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z,
GLsizei width, GLsizei height, GLsizei width, GLsizei height,
struct pipe_texture *pt) struct pipe_texture *pt,
const GLfloat *color)
{ {
struct st_context *st = ctx->st; struct st_context *st = ctx->st;
struct pipe_context *pipe = ctx->st->pipe; struct pipe_context *pipe = ctx->st->pipe;
@@ -505,7 +508,7 @@ draw_bitmap_quad(GLcontext *ctx, GLint x, GLint y, GLfloat z,
/* draw textured quad */ /* draw textured quad */
setup_bitmap_vertex_data(st, x, y, width, height, setup_bitmap_vertex_data(st, x, y, width, height,
ctx->Current.RasterPos[2], ctx->Current.RasterPos[2],
ctx->Current.RasterColor); color);
util_draw_vertex_buffer(pipe, st->bitmap.vbuf, util_draw_vertex_buffer(pipe, st->bitmap.vbuf,
PIPE_PRIM_TRIANGLE_FAN, PIPE_PRIM_TRIANGLE_FAN,
@@ -592,7 +595,8 @@ st_flush_bitmap_cache(struct st_context *st)
cache->ypos, cache->ypos,
st->ctx->Current.RasterPos[2], st->ctx->Current.RasterPos[2],
BITMAP_CACHE_WIDTH, BITMAP_CACHE_HEIGHT, BITMAP_CACHE_WIDTH, BITMAP_CACHE_HEIGHT,
cache->texture); cache->texture,
cache->color);
} }
/* release/free the texture */ /* release/free the texture */
@@ -624,8 +628,10 @@ accum_bitmap(struct st_context *st,
px = x - cache->xpos; /* pos in buffer */ px = x - cache->xpos; /* pos in buffer */
py = y - cache->ypos; py = y - cache->ypos;
if (px < 0 || px + width > BITMAP_CACHE_WIDTH || if (px < 0 || px + width > BITMAP_CACHE_WIDTH ||
py < 0 || py + height > BITMAP_CACHE_HEIGHT) { py < 0 || py + height > BITMAP_CACHE_HEIGHT ||
/* This bitmap would extend beyond cache bounds, !TEST_EQ_4V(st->ctx->Current.RasterColor, cache->color)) {
/* This bitmap would extend beyond cache bounds, or the bitmap
* color is changing
* so flush and continue. * so flush and continue.
*/ */
st_flush_bitmap_cache(st); st_flush_bitmap_cache(st);
@@ -639,6 +645,7 @@ accum_bitmap(struct st_context *st,
cache->xpos = x; cache->xpos = x;
cache->ypos = y - py; cache->ypos = y - py;
cache->empty = GL_FALSE; cache->empty = GL_FALSE;
COPY_4FV(cache->color, st->ctx->Current.RasterColor);
} }
assert(px != -999); assert(px != -999);
@@ -694,7 +701,8 @@ st_Bitmap(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
if (pt) { if (pt) {
assert(pt->target == PIPE_TEXTURE_2D); assert(pt->target == PIPE_TEXTURE_2D);
draw_bitmap_quad(ctx, x, y, ctx->Current.RasterPos[2], draw_bitmap_quad(ctx, x, y, ctx->Current.RasterPos[2],
width, height, pt); width, height, pt,
st->ctx->Current.RasterColor);
/* release/free the texture */ /* release/free the texture */
pipe_texture_reference(&pt, NULL); pipe_texture_reference(&pt, NULL);
} }