Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/glsl_shader.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/glsl_shader.c	(revision 39568)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/glsl_shader.c	(revision 39569)
@@ -127,21 +127,11 @@
     UINT                        constant_version;
     const struct wined3d_context *context;
-#ifdef VBOX_WITH_WDDM
     UINT                        inp2Fixup_info;
-#else
-    const struct ps_np2fixup_info *np2Fixup_info;
-#endif
 };
 
-#ifdef VBOX_WITH_WDDM
 #define WINEFIXUPINFO_NOINDEX (~0UL)
 #define WINEFIXUPINFO_GET(_p) get_fixup_info((const IWineD3DPixelShaderImpl*)(_p)->pshader, (_p)->inp2Fixup_info)
 #define WINEFIXUPINFO_ISVALID(_p) ((_p)->inp2Fixup_info != WINEFIXUPINFO_NOINDEX)
 #define WINEFIXUPINFO_INIT(_p) ((_p)->inp2Fixup_info == WINEFIXUPINFO_NOINDEX)
-#else
-#define WINEFIXUPINFO_GET(_p) ((_p)->np2Fixup_info)
-#define WINEFIXUPINFO_ISVALID(_p) (!!(_p)->np2Fixup_info)
-#define WINEFIXUPINFO_INIT(_p) ((_p)->np2Fixup_info == NULL)
-#endif
 
 typedef struct {
@@ -734,5 +724,4 @@
 }
 
-#ifdef VBOX_WITH_WDDM
 static const struct ps_np2fixup_info * get_fixup_info(const IWineD3DPixelShaderImpl *shader, UINT inp2fixup_info)
 {
@@ -757,5 +746,4 @@
     return &shader_data->gl_shaders[inp2fixup_info].np2fixup;
 }
-#endif
 
 /**
@@ -4285,9 +4273,5 @@
         struct wined3d_shader_buffer *buffer, IWineD3DPixelShaderImpl *shader,
         const struct ps_compile_args *args,
-#ifdef VBOX_WITH_WDDM
         UINT *inp2fixup_info
-#else
-        const struct ps_np2fixup_info **np2fixup_info
-#endif
         )
 {
@@ -4318,9 +4302,5 @@
            && memcmp(&shader_data->gl_shaders[i].args, args, sizeof(*args)) == 0) {
             if(args->np2_fixup) {
-#ifdef VBOX_WITH_WDDM
                 *inp2fixup_info = i;
-#else
-                *np2fixup_info = &shader_data->gl_shaders[i].np2fixup;
-#endif
             }
             return shader_data->gl_shaders[i].prgId;
@@ -4359,9 +4339,5 @@
     shader_buffer_clear(buffer);
     ret = shader_glsl_generate_pshader(context, buffer, shader, args, np2fixup);
-#ifdef VBOX_WITH_WDDM
     *inp2fixup_info = shader_data->num_gl_shaders;
-#else
-    *np2fixup_info = np2fixup;
-#endif
     shader_data->gl_shaders[shader_data->num_gl_shaders++].prgId = ret;
 
@@ -4541,9 +4517,5 @@
         GLhandleARB pshader_id = find_glsl_pshader(context, &priv->shader_buffer,
                 (IWineD3DPixelShaderImpl *)pshader, &ps_compile_args,
-#ifdef VBOX_WITH_WDDM
                 &entry->inp2Fixup_info
-#else
-                &entry->np2Fixup_info
-#endif
                 );
         TRACE("Attaching GLSL shader object %u to program %u\n", pshader_id, programId);