xf86-video-ati: Branch 'master' - 2 commits
Michel Dänzer
daenzer at kemper.freedesktop.org
Thu Jul 30 03:04:33 PDT 2015
src/radeon_glamor.h | 7 +++----
src/radeon_probe.c | 7 +------
2 files changed, 4 insertions(+), 10 deletions(-)
New commits:
commit 09c7cdb923965f9a1ea11d2f449bc02114408938
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Thu Jul 30 15:58:54 2015 +0900
glamor: Move declaration of struct radeon_pixmap out of #if/#else blocks
Reviewed-by: Dave Airlie <airlied at redhat.com>
diff --git a/src/radeon_glamor.h b/src/radeon_glamor.h
index c77466e..246336b 100644
--- a/src/radeon_glamor.h
+++ b/src/radeon_glamor.h
@@ -28,6 +28,9 @@
#define RADEON_GLAMOR_H
#include "xf86xv.h"
+
+struct radeon_pixmap;
+
#ifdef USE_GLAMOR
#define GLAMOR_FOR_XORG 1
@@ -43,8 +46,6 @@
(((usage) & ~RADEON_CREATE_PIXMAP_TILING_FLAGS) == RADEON_CREATE_PIXMAP_DRI2 || \
(usage) == CREATE_PIXMAP_USAGE_SHARED)
-struct radeon_pixmap;
-
#ifndef GLAMOR_NO_DRI3
#define GLAMOR_NO_DRI3 0
#define glamor_fd_from_pixmap glamor_dri3_fd_from_pixmap
@@ -74,8 +75,6 @@ XF86VideoAdaptorPtr radeon_glamor_xv_init(ScreenPtr pScreen, int num_adapt);
#else
-struct radeon_pixmap;
-
static inline Bool radeon_glamor_pre_init(ScrnInfoPtr scrn) { return FALSE; }
static inline Bool radeon_glamor_init(ScreenPtr screen) { return FALSE; }
static inline Bool radeon_glamor_create_screen_resources(ScreenPtr screen) { return FALSE; }
commit 936582fde0db461c5c3d78ce4f5f4c93a88a489d
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Thu Jul 30 15:56:36 2015 +0900
Remove unused local variable pRADEONEnt
../../src/radeon_probe.c: In function 'radeon_get_scrninfo':
../../src/radeon_probe.c:157:22: warning: variable 'pRADEONEnt' set but not used [-Wunused-but-set-variable]
RADEONEntPtr pRADEONEnt;
^
Reviewed-by: Dave Airlie <airlied at redhat.com>
diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index f81ed13..65cf0c9 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -154,7 +154,6 @@ radeon_get_scrninfo(int entity_num, void *pci_dev)
*/
{
DevUnion *pPriv;
- RADEONEntPtr pRADEONEnt;
xf86SetEntitySharable(entity_num);
@@ -166,12 +165,8 @@ radeon_get_scrninfo(int entity_num, void *pci_dev)
xf86SetEntityInstanceForScreen(pScrn, pEnt->index, xf86GetNumEntityInstances(pEnt->index) - 1);
- if (!pPriv->ptr) {
+ if (!pPriv->ptr)
pPriv->ptr = xnfcalloc(sizeof(RADEONEntRec), 1);
- pRADEONEnt = pPriv->ptr;
- } else {
- pRADEONEnt = pPriv->ptr;
- }
}
free(pEnt);
More information about the xorg-commit
mailing list