#define DBG 0
#define LOCAL_VARS \
- intelContextPtr intel = INTEL_CONTEXT(ctx); \
+ intelContextPtr intel = INTEL_CONTEXT(ctx); \
__DRIdrawablePrivate *dPriv = intel->driDrawable; \
- intelScreenPrivate *intelScreen = intel->intelScreen; \
- GLuint pitch = intelScreen->backPitch * intelScreen->cpp; \
+ driRenderbuffer *drb = (driRenderbuffer *) rb; \
+ GLuint pitch = drb->pitch * drb->cpp; \
GLuint height = dPriv->h; \
- char *buf = (char *)(intel->drawMap + \
- dPriv->x * intelScreen->cpp + \
- dPriv->y * pitch); \
- char *read_buf = (char *)(intel->readMap + \
- dPriv->x * intelScreen->cpp + \
- dPriv->y * pitch); \
- GLushort p; \
- (void) read_buf; (void) buf; (void) p
+ char *buf = (char *) drb->Base.Data + \
+ dPriv->x * drb->cpp + \
+ dPriv->y * pitch; \
+ GLushort p; \
+ (void) buf; (void) p
#define LOCAL_DEPTH_VARS \
- intelContextPtr intel = INTEL_CONTEXT(ctx); \
+ intelContextPtr intel = INTEL_CONTEXT(ctx); \
__DRIdrawablePrivate *dPriv = intel->driDrawable; \
- intelScreenPrivate *intelScreen = intel->intelScreen; \
- GLuint pitch = intelScreen->backPitch * intelScreen->cpp; \
+ driRenderbuffer *drb = (driRenderbuffer *) rb; \
+ GLuint pitch = drb->pitch * drb->cpp; \
GLuint height = dPriv->h; \
- char *buf = (char *)(intelScreen->depth.map + \
- dPriv->x * intelScreen->cpp + \
- dPriv->y * pitch)
+ char *buf = (char *) drb->Base.Data + \
+ dPriv->x * drb->cpp + \
+ dPriv->y * pitch
#define LOCAL_STENCIL_VARS LOCAL_DEPTH_VARS
#define INIT_MONO_PIXEL(p,color)\
p = INTEL_PACKCOLOR565(color[0],color[1],color[2])
-#define CLIPPIXEL(_x,_y) (_x >= minx && _x < maxx && \
- _y >= miny && _y < maxy)
-
-#define CLIPSPAN( _x, _y, _n, _x1, _n1, _i ) \
- if ( _y < miny || _y >= maxy ) { \
- _n1 = 0, _x1 = x; \
- } else { \
- _n1 = _n; \
- _x1 = _x; \
- if ( _x1 < minx ) _i += (minx-_x1), n1 -= (minx-_x1), _x1 = minx; \
- if ( _x1 + _n1 >= maxx ) n1 -= (_x1 + n1 - maxx); \
- }
-
#define Y_FLIP(_y) (height - _y - 1)
-
#define HW_LOCK()
-#define HW_CLIPLOOP() \
- do { \
- __DRIdrawablePrivate *dPriv = intel->driDrawable; \
- int _nc = dPriv->numClipRects; \
- while (_nc--) { \
- int minx = dPriv->pClipRects[_nc].x1 - dPriv->x; \
- int miny = dPriv->pClipRects[_nc].y1 - dPriv->y; \
- int maxx = dPriv->pClipRects[_nc].x2 - dPriv->x; \
- int maxy = dPriv->pClipRects[_nc].y2 - dPriv->y;
-
-
-#define HW_ENDCLIPLOOP() \
- } \
- } while (0)
-
#define HW_UNLOCK()
/* 16 bit, 565 rgb color spanline and pixel functions
#define READ_RGBA( rgba, _x, _y ) \
do { \
- GLushort p = *(GLushort *)(read_buf + _x*2 + _y*pitch); \
+ GLushort p = *(GLushort *)(buf + _x*2 + _y*pitch); \
rgba[0] = (((p >> 11) & 0x1f) * 255) / 31; \
rgba[1] = (((p >> 5) & 0x3f) * 255) / 63; \
rgba[2] = (((p >> 0) & 0x1f) * 255) / 31; \
#define TAG(x) intel##x##_565
#include "spantmp.h"
-
-
-
/* 15 bit, 555 rgb color spanline and pixel functions
*/
#define WRITE_RGBA( _x, _y, r, g, b, a ) \
#define READ_RGBA( rgba, _x, _y ) \
do { \
- GLushort p = *(GLushort *)(read_buf + _x*2 + _y*pitch); \
+ GLushort p = *(GLushort *)(buf + _x*2 + _y*pitch); \
rgba[0] = (p >> 7) & 0xf8; \
rgba[1] = (p >> 3) & 0xf8; \
rgba[2] = (p << 3) & 0xf8; \
/* 16 bit depthbuffer functions.
*/
#define WRITE_DEPTH( _x, _y, d ) \
- *(GLushort *)(buf + _x*2 + _y*pitch) = d;
+ *(GLushort *)(buf + (_x)*2 + (_y)*pitch) = d;
#define READ_DEPTH( d, _x, _y ) \
- d = *(GLushort *)(buf + _x*2 + _y*pitch);
+ d = *(GLushort *)(buf + (_x)*2 + (_y)*pitch);
-#define TAG(x) intel##x##_16
+#define TAG(x) intel##x##_z16
#include "depthtmp.h"
#define LOCAL_VARS \
intelContextPtr intel = INTEL_CONTEXT(ctx); \
__DRIdrawablePrivate *dPriv = intel->driDrawable; \
- intelScreenPrivate *intelScreen = intel->intelScreen; \
- GLuint pitch = intelScreen->backPitch * intelScreen->cpp; \
+ driRenderbuffer *drb = (driRenderbuffer *) rb; \
+ GLuint pitch = drb->pitch * drb->cpp; \
GLuint height = dPriv->h; \
- char *buf = (char *)(intel->drawMap + \
- dPriv->x * intelScreen->cpp + \
- dPriv->y * pitch); \
- char *read_buf = (char *)(intel->readMap + \
- dPriv->x * intelScreen->cpp + \
- dPriv->y * pitch); \
+ char *buf = (char *)drb->Base.Data + \
+ dPriv->x * drb->cpp + \
+ dPriv->y * pitch; \
GLuint p; \
- (void) read_buf; (void) buf; (void) p
+ (void) buf; (void) p
#undef INIT_MONO_PIXEL
#define INIT_MONO_PIXEL(p,color)\
#define READ_RGBA(rgba, _x, _y) \
do { \
- GLuint p = *(GLuint *)(read_buf + _x*4 + _y*pitch); \
+ GLuint p = *(GLuint *)(buf + _x*4 + _y*pitch); \
rgba[0] = (p >> 16) & 0xff; \
rgba[1] = (p >> 8) & 0xff; \
rgba[2] = (p >> 0) & 0xff; \
d = *(GLuint *)(buf + (_x)*4 + (_y)*pitch) & 0xffffff;
-#define TAG(x) intel##x##_24_8
+#define TAG(x) intel##x##_z24_s8
#include "depthtmp.h"
#define WRITE_STENCIL( _x, _y, d ) { \
#define READ_STENCIL( d, _x, _y ) \
d = *(GLuint *)(buf + (_x)*4 + (_y)*pitch) >> 24;
-#define TAG(x) intel##x##_24_8
+#define TAG(x) intel##x##_z24_s8
#include "stenciltmp.h"
-/*
- * 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 intelSetBuffer(GLcontext *ctx, GLframebuffer *colorBuffer,
- GLuint bufferBit)
-{
- intelContextPtr intel = INTEL_CONTEXT(ctx);
- if (bufferBit == DD_FRONT_LEFT_BIT) {
- intel->drawMap = (char *)intel->driScreen->pFB;
- intel->readMap = (char *)intel->driScreen->pFB;
- } else if (bufferBit == DD_BACK_LEFT_BIT) {
- intel->drawMap = intel->intelScreen->back.map;
- intel->readMap = intel->intelScreen->back.map;
- } else {
- ASSERT(0);
- }
-}
-
-
/* Move locking out to get reasonable span performance.
*/
void intelSpanRenderStart( GLcontext *ctx )
void intelInitSpanFuncs( GLcontext *ctx )
{
- intelContextPtr intel = INTEL_CONTEXT(ctx);
- intelScreenPrivate *intelScreen = intel->intelScreen;
-
struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference(ctx);
-
- swdd->SetBuffer = intelSetBuffer;
-
- switch (intelScreen->fbFormat) {
- case DV_PF_555:
- swdd->WriteRGBASpan = intelWriteRGBASpan_555;
- swdd->WriteRGBSpan = intelWriteRGBSpan_555;
- swdd->WriteMonoRGBASpan = intelWriteMonoRGBASpan_555;
- swdd->WriteRGBAPixels = intelWriteRGBAPixels_555;
- swdd->WriteMonoRGBAPixels = intelWriteMonoRGBAPixels_555;
- swdd->ReadRGBASpan = intelReadRGBASpan_555;
- swdd->ReadRGBAPixels = intelReadRGBAPixels_555;
-
- swdd->ReadDepthSpan = intelReadDepthSpan_16;
- swdd->WriteDepthSpan = intelWriteDepthSpan_16;
- swdd->ReadDepthPixels = intelReadDepthPixels_16;
- swdd->WriteDepthPixels = intelWriteDepthPixels_16;
- break;
-
- case DV_PF_565:
- swdd->WriteRGBASpan = intelWriteRGBASpan_565;
- swdd->WriteRGBSpan = intelWriteRGBSpan_565;
- swdd->WriteMonoRGBASpan = intelWriteMonoRGBASpan_565;
- swdd->WriteRGBAPixels = intelWriteRGBAPixels_565;
- swdd->WriteMonoRGBAPixels = intelWriteMonoRGBAPixels_565;
- swdd->ReadRGBASpan = intelReadRGBASpan_565;
- swdd->ReadRGBAPixels = intelReadRGBAPixels_565;
-
- swdd->ReadDepthSpan = intelReadDepthSpan_16;
- swdd->WriteDepthSpan = intelWriteDepthSpan_16;
- swdd->ReadDepthPixels = intelReadDepthPixels_16;
- swdd->WriteDepthPixels = intelWriteDepthPixels_16;
- break;
-
- case DV_PF_8888:
- swdd->WriteRGBASpan = intelWriteRGBASpan_8888;
- swdd->WriteRGBSpan = intelWriteRGBSpan_8888;
- swdd->WriteMonoRGBASpan = intelWriteMonoRGBASpan_8888;
- swdd->WriteRGBAPixels = intelWriteRGBAPixels_8888;
- swdd->WriteMonoRGBAPixels = intelWriteMonoRGBAPixels_8888;
- swdd->ReadRGBASpan = intelReadRGBASpan_8888;
- swdd->ReadRGBAPixels = intelReadRGBAPixels_8888;
-
- swdd->ReadDepthSpan = intelReadDepthSpan_24_8;
- swdd->WriteDepthSpan = intelWriteDepthSpan_24_8;
- swdd->ReadDepthPixels = intelReadDepthPixels_24_8;
- swdd->WriteDepthPixels = intelWriteDepthPixels_24_8;
-
- swdd->WriteStencilSpan = intelWriteStencilSpan_24_8;
- swdd->ReadStencilSpan = intelReadStencilSpan_24_8;
- swdd->WriteStencilPixels = intelWriteStencilPixels_24_8;
- swdd->ReadStencilPixels = intelReadStencilPixels_24_8;
- break;
- }
-
swdd->SpanRenderStart = intelSpanRenderStart;
swdd->SpanRenderFinish = intelSpanRenderFinish;
}
+
+
+/**
+ * Plug in the Get/Put routines for the given driRenderbuffer.
+ */
+void
+intelSetSpanFunctions(driRenderbuffer *drb, const GLvisual *vis)
+{
+ if (drb->Base.InternalFormat == GL_RGBA) {
+ if (vis->redBits == 5 && vis->greenBits == 5 && vis->blueBits == 5) {
+ intelInitPointers_555(&drb->Base);
+ }
+ else if (vis->redBits == 5 && vis->greenBits == 6 && vis->blueBits == 5) {
+ intelInitPointers_565(&drb->Base);
+ }
+ else {
+ assert(vis->redBits == 8);
+ assert(vis->greenBits == 8);
+ assert(vis->blueBits == 8);
+ intelInitPointers_8888(&drb->Base);
+ }
+ }
+ else if (drb->Base.InternalFormat == GL_DEPTH_COMPONENT16) {
+ intelInitDepthPointers_z16(&drb->Base);
+ }
+ else if (drb->Base.InternalFormat == GL_DEPTH_COMPONENT24) {
+ intelInitDepthPointers_z24_s8(&drb->Base);
+ }
+ else if (drb->Base.InternalFormat == GL_STENCIL_INDEX8_EXT) {
+ intelInitStencilPointers_z24_s8(&drb->Base);
+ }
+}
projects / mesa.git / blobdiff