d3d1x: add template parameters to base class ctor calls for GCC 4.4

GCC 4.5 is fine without them, but GCC 4.4 requires them.
Should fully fix the build on GCC 4.4

1 files changed, 12 insertions, 10 deletions

diff --git a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11.cpp b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11.cpp
index 69dfd403f3..46a3905d8f 100644
--- a/src/gallium/state_trackers/d3d1x/gd3d11/d3d11.cpp
+++ b/src/gallium/state_trackers/d3d1x/gd3d11/d3d11.cpp
@@ -126,20 +126,22 @@ struct GalliumD3D11Caps
 	unsigned stages;
 };
 
-// used to avoid needing to have forward declarations of functions
-// this is called "screen" because in the D3D10 case it's only part of the device
-struct GalliumD3D11Screen
-	: public GalliumDXGIDevice<
-		GalliumMultiComObject<
+typedef GalliumDXGIDevice<
+	GalliumMultiComObject<
 #if API >= 11
-			GalliumPrivateDataComObject<ID3D11Device>,
+		GalliumPrivateDataComObject<ID3D11Device>,
 #else
-			GalliumPrivateDataComObject<ID3D10Device1>,
+		GalliumPrivateDataComObject<ID3D10Device1>,
 #endif
-			IGalliumDevice
-		>
+		IGalliumDevice
 	>
+> GalliumD3D11ScreenBase;
+
+// used to avoid needing to have forward declarations of functions
+// this is called "screen" because in the D3D10 case it's only part of the device
+struct GalliumD3D11Screen : public GalliumD3D11ScreenBase
 {
+
 	pipe_screen* screen;
 	pipe_context* immediate_pipe;
 	GalliumD3D11Caps screen_caps;
@@ -159,7 +161,7 @@ struct GalliumD3D11Screen
 
 
 	GalliumD3D11Screen(pipe_screen* screen, struct pipe_context* immediate_pipe, IDXGIAdapter* adapter)
-	: GalliumDXGIDevice(adapter), screen(screen), immediate_pipe(immediate_pipe)
+	: GalliumD3D11ScreenBase(adapter), screen(screen), immediate_pipe(immediate_pipe)
 	{
 	}