From 02d85f2ff2657011ecc679aa4839f17e6d8bb01f Mon Sep 17 00:00:00 2001
From: "M. Liebmann" <git@tuxcode.de>
Date: Wed, 8 Feb 2017 06:02:42 +0100
Subject: [PATCH] neutrino: Replace USE_NEVIS_GXA with hardware-specific macros

- Existing USE_NEVIS_GXA definitions in the build system
  (neutrino configure) can be removed.
---
 src/driver/fb_accel.h     | 7 -------
 src/driver/fb_generic.h   | 2 +-
 src/driver/screenshot.cpp | 4 ++--
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/driver/fb_accel.h b/src/driver/fb_accel.h
index 67225d44a..92f865f32 100644
--- a/src/driver/fb_accel.h
+++ b/src/driver/fb_accel.h
@@ -33,13 +33,6 @@
 #define PARTIAL_BLIT 1
 #endif
 
-#if HAVE_COOL_HARDWARE
-#ifndef BOXMODEL_APOLLO
-/* not needed -- if you don't want acceleration, don't call CFbAccel ;) */
-#define USE_NEVIS_GXA 1
-#endif
-#endif
-
 class CFbAccel
 	: public CFrameBuffer
 {
diff --git a/src/driver/fb_generic.h b/src/driver/fb_generic.h
index 1f48274dc..a7e24bf85 100644
--- a/src/driver/fb_generic.h
+++ b/src/driver/fb_generic.h
@@ -184,7 +184,7 @@ class CFrameBuffer : public sigc::trackable
 
 		bool getActive() const;                     // is framebuffer active?
 		void setActive(bool enable);                     // is framebuffer active?
-#ifdef USE_NEVIS_GXA
+#if HAVE_COOL_HARDWARE && BOXMODEL_NEVIS
 		virtual void setupGXA() {};
 		virtual void add_gxa_sync_marker() {};
 #endif
diff --git a/src/driver/screenshot.cpp b/src/driver/screenshot.cpp
index e438f924b..b6b2fafdc 100644
--- a/src/driver/screenshot.cpp
+++ b/src/driver/screenshot.cpp
@@ -77,7 +77,7 @@ bool CScreenShot::GetData()
 	bool res = false;
 
 	mutex.lock();
-#ifdef USE_NEVIS_GXA
+#if HAVE_COOL_HARDWARE && BOXMODEL_NEVIS
 	CFrameBuffer::getInstance()->setActive(false);
 #endif
 	if (videoDecoder->getBlank()) 
@@ -86,7 +86,7 @@ bool CScreenShot::GetData()
 	res = videoDecoder->GetScreenImage(pixel_data, xres, yres, get_video, get_osd, scale_to_video);
 #endif
 
-#ifdef USE_NEVIS_GXA
+#if HAVE_COOL_HARDWARE && BOXMODEL_NEVIS
 	/* sort of hack. GXA used to transfer/convert live image to RGB,
 	 * so setup GXA back */
 	CFrameBuffer::getInstance()->setupGXA();