diff options
Diffstat (limited to 'xc/lib/GL/mesa/src/drv/i830/i830_span.c')
| -rw-r--r-- | xc/lib/GL/mesa/src/drv/i830/i830_span.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/xc/lib/GL/mesa/src/drv/i830/i830_span.c b/xc/lib/GL/mesa/src/drv/i830/i830_span.c index 232698911..34830bf58 100644 --- a/xc/lib/GL/mesa/src/drv/i830/i830_span.c +++ b/xc/lib/GL/mesa/src/drv/i830/i830_span.c @@ -25,7 +25,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/lib/GL/mesa/src/drv/i830/i830_span.c,v 1.3 2002/09/11 00:29:26 dawes Exp $ */ +/* $XFree86: xc/lib/GL/mesa/src/drv/i830/i830_span.c,v 1.4 2002/12/10 01:26:53 dawes Exp $ */ /* * Author: @@ -38,6 +38,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "glheader.h" #include "macros.h" #include "mtypes.h" +#include "colormac.h" #include "i830_screen.h" #include "i830_dri.h" @@ -204,11 +205,6 @@ do { \ #define WRITE_PIXEL(_x, _y, p) \ *(GLuint *)(buf + _x*4 + _y*pitch) = p -/* Note to Self: - * Don't read alpha from framebuffer, because its not correct. From a - * reading of the spec, this should not be the case, need to ask an - * engineer at Intel. - */ #define READ_RGBA(rgba, _x, _y) \ do { \ @@ -216,7 +212,7 @@ do { \ rgba[0] = (p >> 16) & 0xff; \ rgba[1] = (p >> 8) & 0xff; \ rgba[2] = (p >> 0) & 0xff; \ - rgba[3] = 255; \ + rgba[3] = (p >> 24) & 0xff; \ } while (0) #define TAG(x) i830##x##_8888 @@ -262,13 +258,20 @@ do { \ #define TAG(x) i830##x##_24_8 #include "stenciltmp.h" -static void i830SetReadBuffer(GLcontext *ctx, GLframebuffer *colorBuffer, - GLenum mode) +/* + * This function is called to specify which buffer to read and write + * for software rasterization (swrast) fallbacks. This doesn't necessarily + * correspond to glDrawBuffer() or glReadBuffer() calls. + */ +static void i830SetBuffer(GLcontext *ctx, GLframebuffer *colorBuffer, + GLuint bufferBit) { i830ContextPtr imesa = I830_CONTEXT(ctx); - if (mode == GL_FRONT_LEFT) { - imesa->readMap = (char*)imesa->driScreen->pFB; - } else if (mode == GL_BACK_LEFT) { + if (bufferBit == FRONT_LEFT_BIT) { + imesa->drawMap = (char *)imesa->driScreen->pFB; + imesa->readMap = (char *)imesa->driScreen->pFB; + } else if (bufferBit == BACK_LEFT_BIT) { + imesa->drawMap = imesa->i830Screen->back.map; imesa->readMap = imesa->i830Screen->back.map; } else { ASSERT(0); @@ -283,8 +286,8 @@ void i830SpanRenderStart( GLcontext *ctx ) { i830ContextPtr imesa = I830_CONTEXT(ctx); I830_FIREVERTICES(imesa); - i830DmaFinish(imesa); - LOCK_HARDWARE_QUIESCENT(imesa); + LOCK_HARDWARE(imesa); + i830RegetLockQuiescent( imesa ); } void i830SpanRenderFinish( GLcontext *ctx ) @@ -301,7 +304,7 @@ void i830DDInitSpanFuncs( GLcontext *ctx ) struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference(ctx); - swdd->SetReadBuffer = i830SetReadBuffer; + swdd->SetBuffer = i830SetBuffer; switch (i830Screen->fbFormat) { case DV_PF_555: |