fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 06:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

only call xmesa_set_renderbuffer_funcs() when really necessary

Browse source
This commit is contained in:
Brian Paul 2006-01-09 17:56:55 +00:00
parent 41b9756e9a
commit c2901e4f4c
2 changed files with 51 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
src/mesa/drivers/x11/xm_dd.c
View file

@ -968,14 +968,13 @@ clear_color_HPCR_pixmap( GLcontext *ctx, const GLfloat color[4] )
/**
* Called when the driver should update it's state, based on the new_state
* Called when the driver should update its state, based on the new_state
* flags.
*/
void
xmesa_update_state( GLcontext *ctx, GLuint new_state )
xmesa_update_state( GLcontext *ctx, GLbitfield new_state )
{
const XMesaContext xmesa = XMESA_CONTEXT(ctx);
struct xmesa_renderbuffer *front_xrb, *back_xrb;
/* Propagate statechange information to swrast and swrast_setup
* modules. The X11 driver has no internal GL-dependent state.
@ -988,48 +987,55 @@ xmesa_update_state( GLcontext *ctx, GLuint new_state )
if (ctx->DrawBuffer->Name != 0)
return;
front_xrb = XMESA_BUFFER(ctx->DrawBuffer)->frontxrb;
if (front_xrb) {
/* XXX check for relevant new_state flags */
xmesa_set_renderbuffer_funcs(front_xrb, xmesa->pixelformat,
xmesa->xm_visual->BitsPerPixel);
/* setup pointers to front and back buffer clear functions */
front_xrb->clearFunc = clear_pixmap;
}
/*
* GL_DITHER and GL_READ/DRAW_BUFFER state effect renderbuffer funcs
*/
if (new_state & (_NEW_COLOR | _NEW_PIXEL)) {
struct xmesa_renderbuffer *front_xrb, *back_xrb;
back_xrb = XMESA_BUFFER(ctx->DrawBuffer)->backxrb;
if (back_xrb) {
XMesaBuffer xmbuf = XMESA_BUFFER(ctx->DrawBuffer);
/* XXX check for relevant new_state flags */
xmesa_set_renderbuffer_funcs(back_xrb, xmesa->pixelformat,
xmesa->xm_visual->BitsPerPixel);
if (xmbuf->backxrb->pixmap) {
back_xrb->clearFunc = clear_pixmap;
front_xrb = XMESA_BUFFER(ctx->DrawBuffer)->frontxrb;
if (front_xrb) {
/* XXX check for relevant new_state flags */
xmesa_set_renderbuffer_funcs(front_xrb, xmesa->pixelformat,
xmesa->xm_visual->BitsPerPixel);
/* setup pointers to front and back buffer clear functions */
front_xrb->clearFunc = clear_pixmap;
}
else {
switch (xmesa->xm_visual->BitsPerPixel) {
case 8:
if (xmesa->xm_visual->hpcr_clear_flag) {
back_xrb->clearFunc = clear_HPCR_ximage;
back_xrb = XMESA_BUFFER(ctx->DrawBuffer)->backxrb;
if (back_xrb) {
XMesaBuffer xmbuf = XMESA_BUFFER(ctx->DrawBuffer);
/* XXX check for relevant new_state flags */
xmesa_set_renderbuffer_funcs(back_xrb, xmesa->pixelformat,
xmesa->xm_visual->BitsPerPixel);
if (xmbuf->backxrb->pixmap) {
back_xrb->clearFunc = clear_pixmap;
}
else {
switch (xmesa->xm_visual->BitsPerPixel) {
case 8:
if (xmesa->xm_visual->hpcr_clear_flag) {
back_xrb->clearFunc = clear_HPCR_ximage;
}
else {
back_xrb->clearFunc = clear_8bit_ximage;
}
break;
case 16:
back_xrb->clearFunc = clear_16bit_ximage;
break;
case 24:
back_xrb->clearFunc = clear_24bit_ximage;
break;
case 32:
back_xrb->clearFunc = clear_32bit_ximage;
break;
default:
back_xrb->clearFunc = clear_nbit_ximage;
break;
}
else {
back_xrb->clearFunc = clear_8bit_ximage;
}
break;
case 16:
back_xrb->clearFunc = clear_16bit_ximage;
break;
case 24:
back_xrb->clearFunc = clear_24bit_ximage;
break;
case 32:
back_xrb->clearFunc = clear_32bit_ximage;
break;
default:
back_xrb->clearFunc = clear_nbit_ximage;
break;
}
}
}

6
src/mesa/drivers/x11/xmesaP.h
View file

@ -1,8 +1,8 @@
/*
* Mesa 3-D graphics library
* Version: 6.3
* Version: 6.5
*
* Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
* Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -513,7 +513,7 @@ extern void xmesa_resize_buffers(GLcontext *ctx, GLframebuffer *buffer,
extern void xmesa_init_driver_functions( XMesaVisual xmvisual,
struct dd_function_table *driver );
extern void xmesa_update_state( GLcontext *ctx, GLuint new_state );
extern void xmesa_update_state( GLcontext *ctx, GLbitfield new_state );
extern void
xmesa_set_renderbuffer_funcs(struct xmesa_renderbuffer *xrb,