#include "main/framebuffer.h"
#include "main/renderbuffer.h"
#include "main/fbobject.h"
+#include "swrast/s_renderbuffer.h"
-#define STANDALONE_MMIO
#include "radeon_chipset.h"
#include "radeon_macros.h"
#include "radeon_screen.h"
DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS)
DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0)
DRI_CONF_MAX_TEXTURE_UNITS(3,2,3)
- DRI_CONF_HYPERZ(false)
+ DRI_CONF_HYPERZ("false")
DRI_CONF_COMMAND_BUFFER_SIZE(8, 8, 32)
DRI_CONF_SECTION_END
DRI_CONF_SECTION_QUALITY
DRI_CONF_TEXTURE_DEPTH(DRI_CONF_TEXTURE_DEPTH_FB)
DRI_CONF_DEF_MAX_ANISOTROPY(1.0,"1.0,2.0,4.0,8.0,16.0")
- DRI_CONF_NO_NEG_LOD_BIAS(false)
- DRI_CONF_FORCE_S3TC_ENABLE(false)
+ DRI_CONF_NO_NEG_LOD_BIAS("false")
+ DRI_CONF_FORCE_S3TC_ENABLE("false")
DRI_CONF_COLOR_REDUCTION(DRI_CONF_COLOR_REDUCTION_DITHER)
DRI_CONF_ROUND_MODE(DRI_CONF_ROUND_TRUNC)
DRI_CONF_DITHER_MODE(DRI_CONF_DITHER_XERRORDIFF)
DRI_CONF_ALLOW_LARGE_TEXTURES(2)
DRI_CONF_SECTION_END
DRI_CONF_SECTION_DEBUG
- DRI_CONF_NO_RAST(false)
+ DRI_CONF_NO_RAST("false")
DRI_CONF_SECTION_END
DRI_CONF_END;
static const GLuint __driNConfigOptions = 15;
DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS)
DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0)
DRI_CONF_MAX_TEXTURE_UNITS(6,2,6)
- DRI_CONF_HYPERZ(false)
+ DRI_CONF_HYPERZ("false")
DRI_CONF_COMMAND_BUFFER_SIZE(8, 8, 32)
DRI_CONF_SECTION_END
DRI_CONF_SECTION_QUALITY
DRI_CONF_TEXTURE_DEPTH(DRI_CONF_TEXTURE_DEPTH_FB)
DRI_CONF_DEF_MAX_ANISOTROPY(1.0,"1.0,2.0,4.0,8.0,16.0")
- DRI_CONF_NO_NEG_LOD_BIAS(false)
- DRI_CONF_FORCE_S3TC_ENABLE(false)
+ DRI_CONF_NO_NEG_LOD_BIAS("false")
+ DRI_CONF_FORCE_S3TC_ENABLE("false")
DRI_CONF_COLOR_REDUCTION(DRI_CONF_COLOR_REDUCTION_DITHER)
DRI_CONF_ROUND_MODE(DRI_CONF_ROUND_TRUNC)
DRI_CONF_DITHER_MODE(DRI_CONF_DITHER_XERRORDIFF)
DRI_CONF_TEXTURE_BLEND_QUALITY(1.0,"0.0:1.0")
DRI_CONF_SECTION_END
DRI_CONF_SECTION_DEBUG
- DRI_CONF_NO_RAST(false)
- DRI_CONF_SECTION_END
- DRI_CONF_SECTION_SOFTWARE
- DRI_CONF_NV_VERTEX_PROGRAM(false)
+ DRI_CONF_NO_RAST("false")
DRI_CONF_SECTION_END
DRI_CONF_END;
-static const GLuint __driNConfigOptions = 17;
+static const GLuint __driNConfigOptions = 16;
#endif
radeonSetTexBuffer,
radeonSetTexBuffer2,
};
-#endif
-
-#if defined(RADEON_R200)
+#elif defined(RADEON_R200)
static const __DRItexBufferExtension r200TexBufferExtension = {
{ __DRI_TEX_BUFFER, __DRI_TEX_BUFFER_VERSION },
r200SetTexBuffer,
radeonContextPtr rmesa;
rmesa = (radeonContextPtr) drawable->driContextPriv->driverPrivate;
- radeonFlush(rmesa->glCtx);
+ radeonFlush(&rmesa->glCtx);
}
static const struct __DRI2flushExtensionRec radeonFlushExtension = {
- { __DRI2_FLUSH, __DRI2_FLUSH_VERSION },
+ { __DRI2_FLUSH, 3 },
radeonDRI2Flush,
dri2InvalidateDrawable,
};
int name, int pitch, void *loaderPrivate)
{
__DRIimage *image;
- radeonScreenPtr radeonScreen = screen->private;
+ radeonScreenPtr radeonScreen = screen->driverPrivate;
if (name == 0)
return NULL;
- image = CALLOC(sizeof *image);
+ image = calloc(1, sizeof *image);
if (image == NULL)
return NULL;
0);
if (image->bo == NULL) {
- FREE(image);
+ free(image);
return NULL;
}
struct gl_renderbuffer *rb;
struct radeon_renderbuffer *rrb;
- rb = _mesa_lookup_renderbuffer(radeon->glCtx, renderbuffer);
+ rb = _mesa_lookup_renderbuffer(&radeon->glCtx, renderbuffer);
if (!rb) {
- _mesa_error(radeon->glCtx,
+ _mesa_error(&radeon->glCtx,
GL_INVALID_OPERATION, "glRenderbufferExternalMESA");
return NULL;
}
rrb = radeon_renderbuffer(rb);
- image = CALLOC(sizeof *image);
+ image = calloc(1, sizeof *image);
if (image == NULL)
return NULL;
image->internal_format = rb->InternalFormat;
image->format = rb->Format;
image->cpp = rrb->cpp;
- image->data_type = rb->DataType;
+ image->data_type = GL_UNSIGNED_BYTE;
image->data = loaderPrivate;
radeon_bo_ref(rrb->bo);
image->bo = rrb->bo;
radeon_destroy_image(__DRIimage *image)
{
radeon_bo_unref(image->bo);
- FREE(image);
+ free(image);
}
static __DRIimage *
void *loaderPrivate)
{
__DRIimage *image;
- radeonScreenPtr radeonScreen = screen->private;
+ radeonScreenPtr radeonScreen = screen->driverPrivate;
- image = CALLOC(sizeof *image);
+ image = calloc(1, sizeof *image);
if (image == NULL)
return NULL;
+ image->dri_format = format;
+
switch (format) {
case __DRI_IMAGE_FORMAT_RGB565:
image->format = MESA_FORMAT_RGB565;
0);
if (image->bo == NULL) {
- FREE(image);
+ free(image);
return NULL;
}
}
static struct __DRIimageExtensionRec radeonImageExtension = {
- { __DRI_IMAGE, __DRI_IMAGE_VERSION },
+ { __DRI_IMAGE, 1 },
radeon_create_image_from_name,
radeon_create_image_from_renderbuffer,
radeon_destroy_image,
screen->device_id = device_id;
screen->chip_flags = 0;
switch ( device_id ) {
+#if defined(RADEON_R100)
case PCI_CHIP_RN50_515E:
case PCI_CHIP_RN50_5969:
return -1;
case PCI_CHIP_RADEON_QG:
/* all original radeons (7200) presumably have a stencil op bug */
screen->chip_family = CHIP_FAMILY_R100;
- screen->chip_flags = RADEON_CHIPSET_TCL | RADEON_CHIPSET_BROKEN_STENCIL;
+ screen->chip_flags = RADEON_CHIPSET_TCL | RADEON_CHIPSET_BROKEN_STENCIL | RADEON_CHIPSET_DEPTH_ALWAYS_TILED;
break;
case PCI_CHIP_RV200_QW:
case PCI_CHIP_RADEON_LW:
case PCI_CHIP_RADEON_LX:
screen->chip_family = CHIP_FAMILY_RV200;
- screen->chip_flags = RADEON_CHIPSET_TCL;
+ screen->chip_flags = RADEON_CHIPSET_TCL | RADEON_CHIPSET_DEPTH_ALWAYS_TILED;
break;
+#elif defined(RADEON_R200)
case PCI_CHIP_R200_BB:
case PCI_CHIP_R200_QH:
case PCI_CHIP_R200_QL:
case PCI_CHIP_R200_QM:
screen->chip_family = CHIP_FAMILY_R200;
- screen->chip_flags = RADEON_CHIPSET_TCL;
+ screen->chip_flags = RADEON_CHIPSET_TCL | RADEON_CHIPSET_DEPTH_ALWAYS_TILED;
break;
case PCI_CHIP_RV250_If:
case PCI_CHIP_RV250_Lf:
case PCI_CHIP_RV250_Lg:
screen->chip_family = CHIP_FAMILY_RV250;
- screen->chip_flags = R200_CHIPSET_YCBCR_BROKEN | RADEON_CHIPSET_TCL;
+ screen->chip_flags = R200_CHIPSET_YCBCR_BROKEN | RADEON_CHIPSET_TCL | RADEON_CHIPSET_DEPTH_ALWAYS_TILED;
break;
+ case PCI_CHIP_RV280_4C6E:
case PCI_CHIP_RV280_5960:
case PCI_CHIP_RV280_5961:
case PCI_CHIP_RV280_5962:
case PCI_CHIP_RV280_5C61:
case PCI_CHIP_RV280_5C63:
screen->chip_family = CHIP_FAMILY_RV280;
- screen->chip_flags = RADEON_CHIPSET_TCL;
+ screen->chip_flags = RADEON_CHIPSET_TCL | RADEON_CHIPSET_DEPTH_ALWAYS_TILED;
break;
case PCI_CHIP_RS300_5834:
case PCI_CHIP_RS350_7834:
case PCI_CHIP_RS350_7835:
screen->chip_family = CHIP_FAMILY_RS300;
+ screen->chip_flags = RADEON_CHIPSET_DEPTH_ALWAYS_TILED;
break;
-
- case PCI_CHIP_R300_AD:
- case PCI_CHIP_R300_AE:
- case PCI_CHIP_R300_AF:
- case PCI_CHIP_R300_AG:
- case PCI_CHIP_R300_ND:
- case PCI_CHIP_R300_NE:
- case PCI_CHIP_R300_NF:
- case PCI_CHIP_R300_NG:
- screen->chip_family = CHIP_FAMILY_R300;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RV350_AP:
- case PCI_CHIP_RV350_AQ:
- case PCI_CHIP_RV350_AR:
- case PCI_CHIP_RV350_AS:
- case PCI_CHIP_RV350_AT:
- case PCI_CHIP_RV350_AV:
- case PCI_CHIP_RV350_AU:
- case PCI_CHIP_RV350_NP:
- case PCI_CHIP_RV350_NQ:
- case PCI_CHIP_RV350_NR:
- case PCI_CHIP_RV350_NS:
- case PCI_CHIP_RV350_NT:
- case PCI_CHIP_RV350_NV:
- screen->chip_family = CHIP_FAMILY_RV350;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_R350_AH:
- case PCI_CHIP_R350_AI:
- case PCI_CHIP_R350_AJ:
- case PCI_CHIP_R350_AK:
- case PCI_CHIP_R350_NH:
- case PCI_CHIP_R350_NI:
- case PCI_CHIP_R360_NJ:
- case PCI_CHIP_R350_NK:
- screen->chip_family = CHIP_FAMILY_R350;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RV370_5460:
- case PCI_CHIP_RV370_5462:
- case PCI_CHIP_RV370_5464:
- case PCI_CHIP_RV370_5B60:
- case PCI_CHIP_RV370_5B62:
- case PCI_CHIP_RV370_5B63:
- case PCI_CHIP_RV370_5B64:
- case PCI_CHIP_RV370_5B65:
- case PCI_CHIP_RV380_3150:
- case PCI_CHIP_RV380_3152:
- case PCI_CHIP_RV380_3154:
- case PCI_CHIP_RV380_3155:
- case PCI_CHIP_RV380_3E50:
- case PCI_CHIP_RV380_3E54:
- screen->chip_family = CHIP_FAMILY_RV380;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_R420_JN:
- case PCI_CHIP_R420_JH:
- case PCI_CHIP_R420_JI:
- case PCI_CHIP_R420_JJ:
- case PCI_CHIP_R420_JK:
- case PCI_CHIP_R420_JL:
- case PCI_CHIP_R420_JM:
- case PCI_CHIP_R420_JO:
- case PCI_CHIP_R420_JP:
- case PCI_CHIP_R420_JT:
- case PCI_CHIP_R481_4B49:
- case PCI_CHIP_R481_4B4A:
- case PCI_CHIP_R481_4B4B:
- case PCI_CHIP_R481_4B4C:
- case PCI_CHIP_R423_UH:
- case PCI_CHIP_R423_UI:
- case PCI_CHIP_R423_UJ:
- case PCI_CHIP_R423_UK:
- case PCI_CHIP_R430_554C:
- case PCI_CHIP_R430_554D:
- case PCI_CHIP_R430_554E:
- case PCI_CHIP_R430_554F:
- case PCI_CHIP_R423_5550:
- case PCI_CHIP_R423_UQ:
- case PCI_CHIP_R423_UR:
- case PCI_CHIP_R423_UT:
- case PCI_CHIP_R430_5D48:
- case PCI_CHIP_R430_5D49:
- case PCI_CHIP_R430_5D4A:
- case PCI_CHIP_R480_5D4C:
- case PCI_CHIP_R480_5D4D:
- case PCI_CHIP_R480_5D4E:
- case PCI_CHIP_R480_5D4F:
- case PCI_CHIP_R480_5D50:
- case PCI_CHIP_R480_5D52:
- case PCI_CHIP_R423_5D57:
- screen->chip_family = CHIP_FAMILY_R420;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RV410_5E4C:
- case PCI_CHIP_RV410_5E4F:
- case PCI_CHIP_RV410_564A:
- case PCI_CHIP_RV410_564B:
- case PCI_CHIP_RV410_564F:
- case PCI_CHIP_RV410_5652:
- case PCI_CHIP_RV410_5653:
- case PCI_CHIP_RV410_5657:
- case PCI_CHIP_RV410_5E48:
- case PCI_CHIP_RV410_5E4A:
- case PCI_CHIP_RV410_5E4B:
- case PCI_CHIP_RV410_5E4D:
- screen->chip_family = CHIP_FAMILY_RV410;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RS480_5954:
- case PCI_CHIP_RS480_5955:
- case PCI_CHIP_RS482_5974:
- case PCI_CHIP_RS482_5975:
- case PCI_CHIP_RS400_5A41:
- case PCI_CHIP_RS400_5A42:
- case PCI_CHIP_RC410_5A61:
- case PCI_CHIP_RC410_5A62:
- screen->chip_family = CHIP_FAMILY_RS400;
- break;
-
- case PCI_CHIP_RS600_793F:
- case PCI_CHIP_RS600_7941:
- case PCI_CHIP_RS600_7942:
- screen->chip_family = CHIP_FAMILY_RS600;
- break;
-
- case PCI_CHIP_RS690_791E:
- case PCI_CHIP_RS690_791F:
- screen->chip_family = CHIP_FAMILY_RS690;
- break;
- case PCI_CHIP_RS740_796C:
- case PCI_CHIP_RS740_796D:
- case PCI_CHIP_RS740_796E:
- case PCI_CHIP_RS740_796F:
- screen->chip_family = CHIP_FAMILY_RS740;
- break;
-
- case PCI_CHIP_R520_7100:
- case PCI_CHIP_R520_7101:
- case PCI_CHIP_R520_7102:
- case PCI_CHIP_R520_7103:
- case PCI_CHIP_R520_7104:
- case PCI_CHIP_R520_7105:
- case PCI_CHIP_R520_7106:
- case PCI_CHIP_R520_7108:
- case PCI_CHIP_R520_7109:
- case PCI_CHIP_R520_710A:
- case PCI_CHIP_R520_710B:
- case PCI_CHIP_R520_710C:
- case PCI_CHIP_R520_710E:
- case PCI_CHIP_R520_710F:
- screen->chip_family = CHIP_FAMILY_R520;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RV515_7140:
- case PCI_CHIP_RV515_7141:
- case PCI_CHIP_RV515_7142:
- case PCI_CHIP_RV515_7143:
- case PCI_CHIP_RV515_7144:
- case PCI_CHIP_RV515_7145:
- case PCI_CHIP_RV515_7146:
- case PCI_CHIP_RV515_7147:
- case PCI_CHIP_RV515_7149:
- case PCI_CHIP_RV515_714A:
- case PCI_CHIP_RV515_714B:
- case PCI_CHIP_RV515_714C:
- case PCI_CHIP_RV515_714D:
- case PCI_CHIP_RV515_714E:
- case PCI_CHIP_RV515_714F:
- case PCI_CHIP_RV515_7151:
- case PCI_CHIP_RV515_7152:
- case PCI_CHIP_RV515_7153:
- case PCI_CHIP_RV515_715E:
- case PCI_CHIP_RV515_715F:
- case PCI_CHIP_RV515_7180:
- case PCI_CHIP_RV515_7181:
- case PCI_CHIP_RV515_7183:
- case PCI_CHIP_RV515_7186:
- case PCI_CHIP_RV515_7187:
- case PCI_CHIP_RV515_7188:
- case PCI_CHIP_RV515_718A:
- case PCI_CHIP_RV515_718B:
- case PCI_CHIP_RV515_718C:
- case PCI_CHIP_RV515_718D:
- case PCI_CHIP_RV515_718F:
- case PCI_CHIP_RV515_7193:
- case PCI_CHIP_RV515_7196:
- case PCI_CHIP_RV515_719B:
- case PCI_CHIP_RV515_719F:
- case PCI_CHIP_RV515_7200:
- case PCI_CHIP_RV515_7210:
- case PCI_CHIP_RV515_7211:
- screen->chip_family = CHIP_FAMILY_RV515;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RV530_71C0:
- case PCI_CHIP_RV530_71C1:
- case PCI_CHIP_RV530_71C2:
- case PCI_CHIP_RV530_71C3:
- case PCI_CHIP_RV530_71C4:
- case PCI_CHIP_RV530_71C5:
- case PCI_CHIP_RV530_71C6:
- case PCI_CHIP_RV530_71C7:
- case PCI_CHIP_RV530_71CD:
- case PCI_CHIP_RV530_71CE:
- case PCI_CHIP_RV530_71D2:
- case PCI_CHIP_RV530_71D4:
- case PCI_CHIP_RV530_71D5:
- case PCI_CHIP_RV530_71D6:
- case PCI_CHIP_RV530_71DA:
- case PCI_CHIP_RV530_71DE:
- screen->chip_family = CHIP_FAMILY_RV530;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_R580_7240:
- case PCI_CHIP_R580_7243:
- case PCI_CHIP_R580_7244:
- case PCI_CHIP_R580_7245:
- case PCI_CHIP_R580_7246:
- case PCI_CHIP_R580_7247:
- case PCI_CHIP_R580_7248:
- case PCI_CHIP_R580_7249:
- case PCI_CHIP_R580_724A:
- case PCI_CHIP_R580_724B:
- case PCI_CHIP_R580_724C:
- case PCI_CHIP_R580_724D:
- case PCI_CHIP_R580_724E:
- case PCI_CHIP_R580_724F:
- case PCI_CHIP_R580_7284:
- screen->chip_family = CHIP_FAMILY_R580;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RV570_7280:
- case PCI_CHIP_RV560_7281:
- case PCI_CHIP_RV560_7283:
- case PCI_CHIP_RV560_7287:
- case PCI_CHIP_RV570_7288:
- case PCI_CHIP_RV570_7289:
- case PCI_CHIP_RV570_728B:
- case PCI_CHIP_RV570_728C:
- case PCI_CHIP_RV560_7290:
- case PCI_CHIP_RV560_7291:
- case PCI_CHIP_RV560_7293:
- case PCI_CHIP_RV560_7297:
- screen->chip_family = CHIP_FAMILY_RV560;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_R600_9400:
- case PCI_CHIP_R600_9401:
- case PCI_CHIP_R600_9402:
- case PCI_CHIP_R600_9403:
- case PCI_CHIP_R600_9405:
- case PCI_CHIP_R600_940A:
- case PCI_CHIP_R600_940B:
- case PCI_CHIP_R600_940F:
- screen->chip_family = CHIP_FAMILY_R600;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RV610_94C0:
- case PCI_CHIP_RV610_94C1:
- case PCI_CHIP_RV610_94C3:
- case PCI_CHIP_RV610_94C4:
- case PCI_CHIP_RV610_94C5:
- case PCI_CHIP_RV610_94C6:
- case PCI_CHIP_RV610_94C7:
- case PCI_CHIP_RV610_94C8:
- case PCI_CHIP_RV610_94C9:
- case PCI_CHIP_RV610_94CB:
- case PCI_CHIP_RV610_94CC:
- case PCI_CHIP_RV610_94CD:
- screen->chip_family = CHIP_FAMILY_RV610;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RV630_9580:
- case PCI_CHIP_RV630_9581:
- case PCI_CHIP_RV630_9583:
- case PCI_CHIP_RV630_9586:
- case PCI_CHIP_RV630_9587:
- case PCI_CHIP_RV630_9588:
- case PCI_CHIP_RV630_9589:
- case PCI_CHIP_RV630_958A:
- case PCI_CHIP_RV630_958B:
- case PCI_CHIP_RV630_958C:
- case PCI_CHIP_RV630_958D:
- case PCI_CHIP_RV630_958E:
- case PCI_CHIP_RV630_958F:
- screen->chip_family = CHIP_FAMILY_RV630;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RV670_9500:
- case PCI_CHIP_RV670_9501:
- case PCI_CHIP_RV670_9504:
- case PCI_CHIP_RV670_9505:
- case PCI_CHIP_RV670_9506:
- case PCI_CHIP_RV670_9507:
- case PCI_CHIP_RV670_9508:
- case PCI_CHIP_RV670_9509:
- case PCI_CHIP_RV670_950F:
- case PCI_CHIP_RV670_9511:
- case PCI_CHIP_RV670_9515:
- case PCI_CHIP_RV670_9517:
- case PCI_CHIP_RV670_9519:
- screen->chip_family = CHIP_FAMILY_RV670;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RV620_95C0:
- case PCI_CHIP_RV620_95C2:
- case PCI_CHIP_RV620_95C4:
- case PCI_CHIP_RV620_95C5:
- case PCI_CHIP_RV620_95C6:
- case PCI_CHIP_RV620_95C7:
- case PCI_CHIP_RV620_95C9:
- case PCI_CHIP_RV620_95CC:
- case PCI_CHIP_RV620_95CD:
- case PCI_CHIP_RV620_95CE:
- case PCI_CHIP_RV620_95CF:
- screen->chip_family = CHIP_FAMILY_RV620;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RV635_9590:
- case PCI_CHIP_RV635_9591:
- case PCI_CHIP_RV635_9593:
- case PCI_CHIP_RV635_9595:
- case PCI_CHIP_RV635_9596:
- case PCI_CHIP_RV635_9597:
- case PCI_CHIP_RV635_9598:
- case PCI_CHIP_RV635_9599:
- case PCI_CHIP_RV635_959B:
- screen->chip_family = CHIP_FAMILY_RV635;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RS780_9610:
- case PCI_CHIP_RS780_9611:
- case PCI_CHIP_RS780_9612:
- case PCI_CHIP_RS780_9613:
- case PCI_CHIP_RS780_9614:
- case PCI_CHIP_RS780_9615:
- case PCI_CHIP_RS780_9616:
- screen->chip_family = CHIP_FAMILY_RS780;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
- case PCI_CHIP_RS880_9710:
- case PCI_CHIP_RS880_9711:
- case PCI_CHIP_RS880_9712:
- case PCI_CHIP_RS880_9713:
- case PCI_CHIP_RS880_9714:
- case PCI_CHIP_RS880_9715:
- screen->chip_family = CHIP_FAMILY_RS880;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RV770_9440:
- case PCI_CHIP_RV770_9441:
- case PCI_CHIP_RV770_9442:
- case PCI_CHIP_RV770_9443:
- case PCI_CHIP_RV770_9444:
- case PCI_CHIP_RV770_9446:
- case PCI_CHIP_RV770_944A:
- case PCI_CHIP_RV770_944B:
- case PCI_CHIP_RV770_944C:
- case PCI_CHIP_RV770_944E:
- case PCI_CHIP_RV770_9450:
- case PCI_CHIP_RV770_9452:
- case PCI_CHIP_RV770_9456:
- case PCI_CHIP_RV770_945A:
- case PCI_CHIP_RV770_945B:
- case PCI_CHIP_RV770_945E:
- case PCI_CHIP_RV790_9460:
- case PCI_CHIP_RV790_9462:
- case PCI_CHIP_RV770_946A:
- case PCI_CHIP_RV770_946B:
- case PCI_CHIP_RV770_947A:
- case PCI_CHIP_RV770_947B:
- screen->chip_family = CHIP_FAMILY_RV770;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RV730_9480:
- case PCI_CHIP_RV730_9487:
- case PCI_CHIP_RV730_9488:
- case PCI_CHIP_RV730_9489:
- case PCI_CHIP_RV730_948A:
- case PCI_CHIP_RV730_948F:
- case PCI_CHIP_RV730_9490:
- case PCI_CHIP_RV730_9491:
- case PCI_CHIP_RV730_9495:
- case PCI_CHIP_RV730_9498:
- case PCI_CHIP_RV730_949C:
- case PCI_CHIP_RV730_949E:
- case PCI_CHIP_RV730_949F:
- screen->chip_family = CHIP_FAMILY_RV730;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RV710_9540:
- case PCI_CHIP_RV710_9541:
- case PCI_CHIP_RV710_9542:
- case PCI_CHIP_RV710_954E:
- case PCI_CHIP_RV710_954F:
- case PCI_CHIP_RV710_9552:
- case PCI_CHIP_RV710_9553:
- case PCI_CHIP_RV710_9555:
- case PCI_CHIP_RV710_9557:
- case PCI_CHIP_RV710_955F:
- screen->chip_family = CHIP_FAMILY_RV710;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_RV740_94A0:
- case PCI_CHIP_RV740_94A1:
- case PCI_CHIP_RV740_94A3:
- case PCI_CHIP_RV740_94B1:
- case PCI_CHIP_RV740_94B3:
- case PCI_CHIP_RV740_94B4:
- case PCI_CHIP_RV740_94B5:
- case PCI_CHIP_RV740_94B9:
- screen->chip_family = CHIP_FAMILY_RV740;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_CEDAR_68E0:
- case PCI_CHIP_CEDAR_68E1:
- case PCI_CHIP_CEDAR_68E4:
- case PCI_CHIP_CEDAR_68E5:
- case PCI_CHIP_CEDAR_68E8:
- case PCI_CHIP_CEDAR_68E9:
- case PCI_CHIP_CEDAR_68F1:
- case PCI_CHIP_CEDAR_68F2:
- case PCI_CHIP_CEDAR_68F8:
- case PCI_CHIP_CEDAR_68F9:
- case PCI_CHIP_CEDAR_68FE:
- screen->chip_family = CHIP_FAMILY_CEDAR;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_REDWOOD_68C0:
- case PCI_CHIP_REDWOOD_68C1:
- case PCI_CHIP_REDWOOD_68C8:
- case PCI_CHIP_REDWOOD_68C9:
- case PCI_CHIP_REDWOOD_68D8:
- case PCI_CHIP_REDWOOD_68D9:
- case PCI_CHIP_REDWOOD_68DA:
- case PCI_CHIP_REDWOOD_68DE:
- screen->chip_family = CHIP_FAMILY_REDWOOD;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_JUNIPER_68A0:
- case PCI_CHIP_JUNIPER_68A1:
- case PCI_CHIP_JUNIPER_68A8:
- case PCI_CHIP_JUNIPER_68A9:
- case PCI_CHIP_JUNIPER_68B0:
- case PCI_CHIP_JUNIPER_68B8:
- case PCI_CHIP_JUNIPER_68B9:
- case PCI_CHIP_JUNIPER_68BA:
- case PCI_CHIP_JUNIPER_68BE:
- case PCI_CHIP_JUNIPER_68BF:
- screen->chip_family = CHIP_FAMILY_JUNIPER;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_CYPRESS_6880:
- case PCI_CHIP_CYPRESS_6888:
- case PCI_CHIP_CYPRESS_6889:
- case PCI_CHIP_CYPRESS_688A:
- case PCI_CHIP_CYPRESS_6898:
- case PCI_CHIP_CYPRESS_6899:
- case PCI_CHIP_CYPRESS_689B:
- case PCI_CHIP_CYPRESS_689E:
- screen->chip_family = CHIP_FAMILY_CYPRESS;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_HEMLOCK_689C:
- case PCI_CHIP_HEMLOCK_689D:
- screen->chip_family = CHIP_FAMILY_HEMLOCK;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_PALM_9802:
- case PCI_CHIP_PALM_9803:
- case PCI_CHIP_PALM_9804:
- case PCI_CHIP_PALM_9805:
- case PCI_CHIP_PALM_9806:
- case PCI_CHIP_PALM_9807:
- screen->chip_family = CHIP_FAMILY_PALM;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_SUMO_9640:
- case PCI_CHIP_SUMO_9641:
- case PCI_CHIP_SUMO_9647:
- case PCI_CHIP_SUMO_9648:
- case PCI_CHIP_SUMO_964A:
- case PCI_CHIP_SUMO_964E:
- case PCI_CHIP_SUMO_964F:
- screen->chip_family = CHIP_FAMILY_SUMO;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_SUMO2_9642:
- case PCI_CHIP_SUMO2_9643:
- case PCI_CHIP_SUMO2_9644:
- case PCI_CHIP_SUMO2_9645:
- screen->chip_family = CHIP_FAMILY_SUMO2;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_BARTS_6720:
- case PCI_CHIP_BARTS_6721:
- case PCI_CHIP_BARTS_6722:
- case PCI_CHIP_BARTS_6723:
- case PCI_CHIP_BARTS_6724:
- case PCI_CHIP_BARTS_6725:
- case PCI_CHIP_BARTS_6726:
- case PCI_CHIP_BARTS_6727:
- case PCI_CHIP_BARTS_6728:
- case PCI_CHIP_BARTS_6729:
- case PCI_CHIP_BARTS_6738:
- case PCI_CHIP_BARTS_6739:
- case PCI_CHIP_BARTS_673E:
- screen->chip_family = CHIP_FAMILY_BARTS;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_TURKS_6740:
- case PCI_CHIP_TURKS_6741:
- case PCI_CHIP_TURKS_6742:
- case PCI_CHIP_TURKS_6743:
- case PCI_CHIP_TURKS_6744:
- case PCI_CHIP_TURKS_6745:
- case PCI_CHIP_TURKS_6746:
- case PCI_CHIP_TURKS_6747:
- case PCI_CHIP_TURKS_6748:
- case PCI_CHIP_TURKS_6749:
- case PCI_CHIP_TURKS_6750:
- case PCI_CHIP_TURKS_6758:
- case PCI_CHIP_TURKS_6759:
- case PCI_CHIP_TURKS_675F:
- screen->chip_family = CHIP_FAMILY_TURKS;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
-
- case PCI_CHIP_CAICOS_6760:
- case PCI_CHIP_CAICOS_6761:
- case PCI_CHIP_CAICOS_6762:
- case PCI_CHIP_CAICOS_6763:
- case PCI_CHIP_CAICOS_6764:
- case PCI_CHIP_CAICOS_6765:
- case PCI_CHIP_CAICOS_6766:
- case PCI_CHIP_CAICOS_6767:
- case PCI_CHIP_CAICOS_6768:
- case PCI_CHIP_CAICOS_6770:
- case PCI_CHIP_CAICOS_6778:
- case PCI_CHIP_CAICOS_6779:
- screen->chip_family = CHIP_FAMILY_CAICOS;
- screen->chip_flags = RADEON_CHIPSET_TCL;
- break;
+#endif
default:
fprintf(stderr, "unknown chip id 0x%x, can't guess.\n",
uint32_t device_id = 0;
/* Allocate the private area */
- screen = (radeonScreenPtr) CALLOC( sizeof(*screen) );
+ screen = calloc(1, sizeof(*screen));
if ( !screen ) {
- __driUtilMessage("%s: Could not allocate memory for screen structure",
- __FUNCTION__);
+ fprintf(stderr, "%s: Could not allocate memory for screen structure", __FUNCTION__);
fprintf(stderr, "leaving here\n");
return NULL;
}
ret = radeonGetParam(sPriv, RADEON_PARAM_DEVICE_ID, &device_id);
if (ret) {
- FREE( screen );
+ free( screen );
fprintf(stderr, "drm_radeon_getparam_t (RADEON_PARAM_DEVICE_ID): %d\n", ret);
return NULL;
}
ret = radeon_set_screen_flags(screen, device_id);
- if (ret == -1)
+ if (ret == -1) {
+ free(screen);
return NULL;
+ }
- if (getenv("R300_NO_TCL"))
+ if (getenv("RADEON_NO_TCL"))
screen->chip_flags &= ~RADEON_CHIPSET_TCL;
- if (screen->chip_family <= CHIP_FAMILY_RS200)
- screen->chip_flags |= RADEON_CLASS_R100;
- else if (screen->chip_family <= CHIP_FAMILY_RV280)
- screen->chip_flags |= RADEON_CLASS_R200;
-
i = 0;
screen->extensions[i++] = &dri2ConfigQueryExtension.base;
#if defined(RADEON_R100)
screen->extensions[i++] = &radeonTexBufferExtension.base;
-#endif
-
-#if defined(RADEON_R200)
+#elif defined(RADEON_R200)
screen->extensions[i++] = &r200TexBufferExtension.base;
#endif
static void
radeonDestroyScreen( __DRIscreen *sPriv )
{
- radeonScreenPtr screen = (radeonScreenPtr)sPriv->private;
+ radeonScreenPtr screen = (radeonScreenPtr)sPriv->driverPrivate;
if (!screen)
return;
/* free all option information */
driDestroyOptionInfo (&screen->optionCache);
- FREE( screen );
- sPriv->private = NULL;
+ free( screen );
+ sPriv->driverPrivate = NULL;
}
static GLboolean
radeonInitDriver( __DRIscreen *sPriv )
{
- sPriv->private = (void *) radeonCreateScreen2( sPriv );
- if ( !sPriv->private ) {
+ sPriv->driverPrivate = (void *) radeonCreateScreen2( sPriv );
+ if ( !sPriv->driverPrivate ) {
radeonDestroyScreen( sPriv );
return GL_FALSE;
}
const struct gl_config *mesaVis,
GLboolean isPixmap )
{
- radeonScreenPtr screen = (radeonScreenPtr) driScrnPriv->private;
+ radeonScreenPtr screen = (radeonScreenPtr) driScrnPriv->driverPrivate;
const GLboolean swDepth = GL_FALSE;
const GLboolean swAlpha = GL_FALSE;
/* front color renderbuffer */
rfb->color_rb[0] = radeon_create_renderbuffer(rgbFormat, driDrawPriv);
- _mesa_add_renderbuffer(&rfb->base, BUFFER_FRONT_LEFT, &rfb->color_rb[0]->base);
+ _mesa_add_renderbuffer(&rfb->base, BUFFER_FRONT_LEFT, &rfb->color_rb[0]->base.Base);
rfb->color_rb[0]->has_surface = 1;
/* back color renderbuffer */
if (mesaVis->doubleBufferMode) {
rfb->color_rb[1] = radeon_create_renderbuffer(rgbFormat, driDrawPriv);
- _mesa_add_renderbuffer(&rfb->base, BUFFER_BACK_LEFT, &rfb->color_rb[1]->base);
+ _mesa_add_renderbuffer(&rfb->base, BUFFER_BACK_LEFT, &rfb->color_rb[1]->base.Base);
rfb->color_rb[1]->has_surface = 1;
}
if (mesaVis->stencilBits == 8) {
struct radeon_renderbuffer *depthStencilRb =
radeon_create_renderbuffer(MESA_FORMAT_S8_Z24, driDrawPriv);
- _mesa_add_renderbuffer(&rfb->base, BUFFER_DEPTH, &depthStencilRb->base);
- _mesa_add_renderbuffer(&rfb->base, BUFFER_STENCIL, &depthStencilRb->base);
+ _mesa_add_renderbuffer(&rfb->base, BUFFER_DEPTH, &depthStencilRb->base.Base);
+ _mesa_add_renderbuffer(&rfb->base, BUFFER_STENCIL, &depthStencilRb->base.Base);
depthStencilRb->has_surface = screen->depthHasSurface;
} else {
/* depth renderbuffer */
struct radeon_renderbuffer *depth =
radeon_create_renderbuffer(MESA_FORMAT_X8_Z24, driDrawPriv);
- _mesa_add_renderbuffer(&rfb->base, BUFFER_DEPTH, &depth->base);
+ _mesa_add_renderbuffer(&rfb->base, BUFFER_DEPTH, &depth->base.Base);
depth->has_surface = screen->depthHasSurface;
}
} else if (mesaVis->depthBits == 16) {
/* just 16-bit depth buffer, no hw stencil */
struct radeon_renderbuffer *depth =
radeon_create_renderbuffer(MESA_FORMAT_Z16, driDrawPriv);
- _mesa_add_renderbuffer(&rfb->base, BUFFER_DEPTH, &depth->base);
+ _mesa_add_renderbuffer(&rfb->base, BUFFER_DEPTH, &depth->base.Base);
depth->has_surface = screen->depthHasSurface;
}
- _mesa_add_soft_renderbuffers(&rfb->base,
+ _swrast_add_soft_renderbuffers(&rfb->base,
GL_FALSE, /* color */
swDepth,
swStencil,
_mesa_reference_framebuffer((struct gl_framebuffer **)(&(driDrawPriv->driverPrivate)), NULL);
}
-#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
-
/**
* This is the driver specific part of the createNewScreen entry point.
* Called when using DRI2.
static const
__DRIconfig **radeonInitScreen2(__DRIscreen *psp)
{
- GLenum fb_format[3];
- GLenum fb_type[3];
+ static const gl_format formats[3] = {
+ MESA_FORMAT_RGB565,
+ MESA_FORMAT_XRGB8888,
+ MESA_FORMAT_ARGB8888
+ };
/* GLX_SWAP_COPY_OML is only supported because the Intel driver doesn't
* support pageflipping at all.
*/
msaa_samples_array[0] = 0;
- fb_format[0] = GL_RGB;
- fb_type[0] = GL_UNSIGNED_SHORT_5_6_5;
-
- fb_format[1] = GL_BGR;
- fb_type[1] = GL_UNSIGNED_INT_8_8_8_8_REV;
-
- fb_format[2] = GL_BGRA;
- fb_type[2] = GL_UNSIGNED_INT_8_8_8_8_REV;
-
- for (color = 0; color < ARRAY_SIZE(fb_format); color++) {
+ for (color = 0; color < ARRAY_SIZE(formats); color++) {
__DRIconfig **new_configs;
- new_configs = driCreateConfigs(fb_format[color], fb_type[color],
+ new_configs = driCreateConfigs(formats[color],
depth_bits,
stencil_bits,
ARRAY_SIZE(depth_bits),
msaa_samples_array,
ARRAY_SIZE(msaa_samples_array),
GL_TRUE);
- if (configs == NULL)
- configs = new_configs;
- else
- configs = driConcatConfigs(configs, new_configs);
+ configs = driConcatConfigs(configs, new_configs);
}
if (configs == NULL) {
projects / mesa.git / blobdiff