summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Behan <connor.behan@gmail.com>2014-08-23 01:24:42 -0400
committerConnor Behan <connor.behan@gmail.com>2014-08-23 01:26:42 -0400
commitfcee44e469b22934a04bd3ee19ed101aaa176a54 (patch)
tree6bc60adc2f27d64062b8c007f50d0f5683357c15
parent089c81ed6b6efc4610e0c5e5fcb36dfd58b83439 (diff)
Silence the non-debug warnings
Some declarations of pScrn are only there for debugging purposes. This should make gcc quieter on most systems. Signed-off-by: Connor Behan <connor.behan@gmail.com>
-rw-r--r--src/r128_driver.c4
-rw-r--r--src/r128_exa_render.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/r128_driver.c b/src/r128_driver.c
index f00fa1d..e4e43a6 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -3109,7 +3109,9 @@ void R128InitLVDSRegisters(R128SavePtr orig, R128SavePtr save, xf86OutputPtr out
void R128InitPLLRegisters(xf86CrtcPtr crtc, R128SavePtr save,
R128PLLPtr pll, double dot_clock)
{
+#if R128_DEBUG
ScrnInfoPtr pScrn = crtc->scrn;
+#endif
unsigned long freq = dot_clock * 100;
struct {
int divider;
@@ -3162,7 +3164,9 @@ void R128InitPLLRegisters(xf86CrtcPtr crtc, R128SavePtr save,
void R128InitPLL2Registers(xf86CrtcPtr crtc, R128SavePtr save,
R128PLLPtr pll, double dot_clock)
{
+#if R128_DEBUG
ScrnInfoPtr pScrn = crtc->scrn;
+#endif
unsigned long freq = dot_clock * 100;
struct {
int divider;
diff --git a/src/r128_exa_render.c b/src/r128_exa_render.c
index c0d3688..b9601ee 100644
--- a/src/r128_exa_render.c
+++ b/src/r128_exa_render.c
@@ -157,8 +157,10 @@ R128GetDatatypePict2(uint32_t format, uint32_t *type)
static Bool
R128CheckCompositeTexture(PicturePtr pPict, PicturePtr pDstPict, int op)
{
+#if R128_DEBUG
ScreenPtr pScreen = pDstPict->pDrawable->pScreen;
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+#endif
unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
uint32_t tmp1;
@@ -198,8 +200,10 @@ R128CheckCompositeTexture(PicturePtr pPict, PicturePtr pDstPict, int op)
static Bool
R128CCECheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture, PicturePtr pDstPicture)
{
+#if R128_DEBUG
ScreenPtr pScreen = pDstPicture->pDrawable->pScreen;
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+#endif
PixmapPtr pSrcPixmap, pDstPixmap;
uint32_t tmp1;