From 498c9e9782186a572885ff9927114706c3d93a22 Mon Sep 17 00:00:00 2001 From: Brian Date: Sat, 11 Aug 2007 20:03:24 +0100 Subject: [PATCH] added Bitmap() stub, call st_validate_state() in DrawPixels --- src/mesa/state_tracker/st_cb_drawpixels.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c index ce417b9b7ea..cdb9ebc3ff2 100644 --- a/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/src/mesa/state_tracker/st_cb_drawpixels.c @@ -437,7 +437,7 @@ draw_blit(struct st_context *st, * Called via ctx->Driver.DrawPixels() */ static void -st_drawpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, +st_DrawPixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, const struct gl_pixelstore_attrib *unpack, const GLvoid *pixels) { @@ -445,6 +445,8 @@ st_drawpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, struct pipe_surface *ps; GLuint bufferFormat; + st_validate_state(st); + if (format == GL_DEPTH_COMPONENT) { ps = st->state.framebuffer.zbuf; } @@ -471,8 +473,21 @@ st_drawpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, } -void st_init_drawpixels_functions(struct dd_function_table *functions) +static void +st_Bitmap(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height, + const struct gl_pixelstore_attrib *unpack, const GLubyte *bitmap ) { - functions->DrawPixels = st_drawpixels; + struct st_context *st = ctx->st; + + st_validate_state(st); + + /* XXX to do */ } + + +void st_init_drawpixels_functions(struct dd_function_table *functions) +{ + functions->DrawPixels = st_DrawPixels; + functions->Bitmap = st_Bitmap; +} -- 2.11.0