AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make radeon stuff build again.

Browse Source 
Yet more evidence that I am incompetent with git.
This commit is contained in:
Corbin Simpson
2008-05-02 15:33:02 -07:00
parent 9a82fde43a
commit 92a0e93ac3
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/radeon/radeon_chipset.h
-4
View File
@@ -147,12 +147,8 @@
#define PCI_CHIP_RV410_5E4D 0x5E4D
#define PCI_CHIP_RV410_5E4F 0x5E4F
<<<<<<< HEAD:src/mesa/drivers/dri/radeon/radeon_chipset.h
#define PCI_CHIP_RV530_71C4 0x71C4
#define PCI_CHIP_RV530_71D5 0x71D5
=======
#define PCI_CHIP_RV530_71C4 0x71C4
>>>>>>> eff6f1203222a776c5990b5d104b57a7f69b9aab:src/mesa/drivers/dri/radeon/radeon_chipset.h
#define PCI_CHIP_RS350_7834 0x7834
#define PCI_CHIP_RS350_7835 0x7835
src/mesa/drivers/dri/radeon/radeon_screen.c
-3
View File
@@ -691,14 +691,11 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
fprintf(stderr, "Warning, R520 detected, 3D HAHAHAHAHA!!.\n");
break;
<<<<<<< HEAD:src/mesa/drivers/dri/radeon/radeon_screen.c
case PCI_CHIP_RV530_71D5:
screen->chip_family = CHIP_FAMILY_R520;
fprintf(stderr, "Warning, RV530 detected, all your base belong to us\n");
break;
=======
>>>>>>> eff6f1203222a776c5990b5d104b57a7f69b9aab:src/mesa/drivers/dri/radeon/radeon_screen.c
default:
fprintf(stderr, "unknown chip id 0x%x, can't guess.\n",
dri_priv->deviceID);