rpms
/
mesa
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

radeon: build fix

This commit is contained in:
Dave Airlie 2009-04-28 05:49:26 +00:00
parent 2638d1a906
commit 9d6cc8706e
1 changed files with 31 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
radeon-rewrite.patch
View File

@ -32673,7 +32673,7 @@ index 1ec06bc..f30eb1c 100644
drm_clip_rect_t *boxes ); drm_clip_rect_t *boxes );
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 8828533..544ab74 100644 index 8828533..9ce950a 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c --- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -35,6 +35,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -35,6 +35,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@ -33164,26 +33164,19 @@ index 8828533..544ab74 100644
if (ret) { if (ret) {
fprintf(stderr, "Unable to get num_pipes, need newer drm\n"); fprintf(stderr, "Unable to get num_pipes, need newer drm\n");
switch (screen->chip_family) { switch (screen->chip_family) {
@@ -961,21 +1010,149 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv ) @@ -962,7 +1011,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
#endif
#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R200) #if RADEON_COMMON && defined(RADEON_COMMON_FOR_R200)
+ if (IS_R200_CLASS(screen)) if (IS_R200_CLASS(screen))
+ screen->extensions[i++] = &r200AllocateExtension.base; - screen->extensions[i++] = &r200AllocateExtension.base;
+ + screen->extensions[i++] = &r200AllocateExtension.base;
+ screen->extensions[i++] = &r200texOffsetExtension.base;
+#endif screen->extensions[i++] = &r200texOffsetExtension.base;
+ #endif
+#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R300) @@ -976,6 +1025,133 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
+ screen->extensions[i++] = &r300texOffsetExtension.base;
+#endif screen->driScreen = sPriv;
+ } screen->sarea_priv_offset = dri_priv->sarea_priv_offset;
+
+ screen->extensions[i++] = NULL;
+ sPriv->extensions = screen->extensions;
+
+ screen->driScreen = sPriv;
+ screen->sarea_priv_offset = dri_priv->sarea_priv_offset;
+ screen->sarea = (drm_radeon_sarea_t *) ((GLubyte *) sPriv->pSAREA + + screen->sarea = (drm_radeon_sarea_t *) ((GLubyte *) sPriv->pSAREA +
+ screen->sarea_priv_offset); + screen->sarea_priv_offset);
+ +
@ -33292,23 +33285,20 @@ index 8828533..544ab74 100644
+#endif +#endif
+ +
+#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R200) +#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R200)
if (IS_R200_CLASS(screen)) + if (IS_R200_CLASS(screen))
screen->extensions[i++] = &r200AllocateExtension.base; + screen->extensions[i++] = &r200AllocateExtension.base;
+
- screen->extensions[i++] = &r200texOffsetExtension.base;
+ screen->extensions[i++] = &r200TexBufferExtension.base; + screen->extensions[i++] = &r200TexBufferExtension.base;
#endif +#endif
+
#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R300) +#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R300)
- screen->extensions[i++] = &r300texOffsetExtension.base;
+ screen->extensions[i++] = &r300TexBufferExtension.base; + screen->extensions[i++] = &r300TexBufferExtension.base;
#endif +#endif
+
screen->extensions[i++] = NULL; + screen->extensions[i++] = NULL;
sPriv->extensions = screen->extensions; + sPriv->extensions = screen->extensions;
+
screen->driScreen = sPriv; + screen->driScreen = sPriv;
- screen->sarea_priv_offset = dri_priv->sarea_priv_offset;
+ screen->bom = radeon_bo_manager_gem_ctor(sPriv->fd); + screen->bom = radeon_bo_manager_gem_ctor(sPriv->fd);
+ if (screen->bom == NULL) { + if (screen->bom == NULL) {
+ free(screen); + free(screen);
@ -33317,7 +33307,7 @@ index 8828533..544ab74 100644
return screen; return screen;
} }
@@ -984,23 +1161,32 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv ) @@ -984,23 +1160,32 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
static void static void
radeonDestroyScreen( __DRIscreenPrivate *sPriv ) radeonDestroyScreen( __DRIscreenPrivate *sPriv )
{ {
@ -33363,7 +33353,7 @@ index 8828533..544ab74 100644
} }
@@ -1009,16 +1195,21 @@ radeonDestroyScreen( __DRIscreenPrivate *sPriv ) @@ -1009,16 +1194,21 @@ radeonDestroyScreen( __DRIscreenPrivate *sPriv )
static GLboolean static GLboolean
radeonInitDriver( __DRIscreenPrivate *sPriv ) radeonInitDriver( __DRIscreenPrivate *sPriv )
{ {
@ -33391,7 +33381,7 @@ index 8828533..544ab74 100644
/** /**
* Create the Mesa framebuffer and renderbuffers for a given window/drawable. * Create the Mesa framebuffer and renderbuffers for a given window/drawable.
* *
@@ -1031,101 +1222,111 @@ radeonCreateBuffer( __DRIscreenPrivate *driScrnPriv, @@ -1031,101 +1221,111 @@ radeonCreateBuffer( __DRIscreenPrivate *driScrnPriv,
const __GLcontextModes *mesaVis, const __GLcontextModes *mesaVis,
GLboolean isPixmap ) GLboolean isPixmap )
{ {
@ -33583,7 +33573,7 @@ index 8828533..544ab74 100644
/** /**
* Choose the appropriate CreateContext function based on the chipset. * Choose the appropriate CreateContext function based on the chipset.
* Eventually, all drivers will go through this process. * Eventually, all drivers will go through this process.
@@ -1136,25 +1337,21 @@ static GLboolean radeonCreateContext(const __GLcontextModes * glVisual, @@ -1136,25 +1336,21 @@ static GLboolean radeonCreateContext(const __GLcontextModes * glVisual,
{ {
__DRIscreenPrivate *sPriv = driContextPriv->driScreenPriv; __DRIscreenPrivate *sPriv = driContextPriv->driScreenPriv;
radeonScreenPtr screen = (radeonScreenPtr) (sPriv->private); radeonScreenPtr screen = (radeonScreenPtr) (sPriv->private);
@ -33619,7 +33609,7 @@ index 8828533..544ab74 100644
/** /**
@@ -1216,13 +1413,103 @@ radeonInitScreen(__DRIscreenPrivate *psp) @@ -1216,13 +1412,103 @@ radeonInitScreen(__DRIscreenPrivate *psp)
if (!radeonInitDriver(psp)) if (!radeonInitDriver(psp))
return NULL; return NULL;
@ -33725,7 +33715,7 @@ index 8828533..544ab74 100644
/** /**
* Get information about previous buffer swaps. * Get information about previous buffer swaps.
@@ -1230,31 +1517,26 @@ radeonInitScreen(__DRIscreenPrivate *psp) @@ -1230,31 +1516,26 @@ radeonInitScreen(__DRIscreenPrivate *psp)
static int static int
getSwapInfo( __DRIdrawablePrivate *dPriv, __DRIswapInfo * sInfo ) getSwapInfo( __DRIdrawablePrivate *dPriv, __DRIswapInfo * sInfo )
{ {
@ -33767,7 +33757,7 @@ index 8828533..544ab74 100644
const struct __DriverAPIRec driDriverAPI = { const struct __DriverAPIRec driDriverAPI = {
.InitScreen = radeonInitScreen, .InitScreen = radeonInitScreen,
.DestroyScreen = radeonDestroyScreen, .DestroyScreen = radeonDestroyScreen,
@@ -1271,23 +1553,7 @@ const struct __DriverAPIRec driDriverAPI = { @@ -1271,23 +1552,7 @@ const struct __DriverAPIRec driDriverAPI = {
.WaitForSBC = NULL, .WaitForSBC = NULL,
.SwapBuffersMSC = NULL, .SwapBuffersMSC = NULL,
.CopySubBuffer = radeonCopySubBuffer, .CopySubBuffer = radeonCopySubBuffer,