1 files changed, 22 insertions, 40 deletions
diff --git a/src/gallium/state_trackers/wgl/shared/stw_pixelformat.h b/src/gallium/state_trackers/wgl/shared/stw_pixelformat.h
index 7ca4194a2a..bec429231b 100644
--- a/src/gallium/state_trackers/wgl/shared/stw_pixelformat.h
+++ b/src/gallium/state_trackers/wgl/shared/stw_pixelformat.h
@@ -25,59 +25,41 @@
  * 
  **************************************************************************/
 
-#ifndef PIXELFORMAT_H
-#define PIXELFORMAT_H
+#ifndef STW_PIXELFORMAT_H
+#define STW_PIXELFORMAT_H
 
 #include <windows.h>
-#include "pipe/p_compiler.h"
-
-#define PF_FLAG_DOUBLEBUFFER  0x00000001
-#define PF_FLAG_MULTISAMPLED  0x00000002
-
-struct pixelformat_color_info
-{
-   uint redbits;
-   uint redshift;
-   uint greenbits;
-   uint greenshift;
-   uint bluebits;
-   uint blueshift;
-};
 
-struct pixelformat_alpha_info
-{
-   uint alphabits;
-   uint alphashift;
-};
+#include "main/mtypes.h"
 
-struct pixelformat_depth_info
-{
-   uint depthbits;
-   uint stencilbits;
-};
+#include "pipe/p_compiler.h"
+#include "pipe/p_format.h"
 
-struct pixelformat_info
+struct stw_pixelformat_info
 {
-   uint flags;
-   struct pixelformat_color_info color;
-   struct pixelformat_alpha_info alpha;
-   struct pixelformat_depth_info depth;
+   enum pipe_format color_format;
+   enum pipe_format depth_stencil_format;
+   
+   PIXELFORMATDESCRIPTOR pfd;
+   
+   unsigned numSampleBuffers;
+   unsigned numSamples;
 };
 
 void
-pixelformat_init( void );
+stw_pixelformat_init( void );
 
 uint
-pixelformat_get_count( void );
+stw_pixelformat_get_count( void );
 
 uint
-pixelformat_get_extended_count( void );
-
-const struct pixelformat_info *
-pixelformat_get_info( uint index );
+stw_pixelformat_get_extended_count( void );
 
-int stw_query_sample_buffers( void );
-int stw_query_samples( void );
+const struct stw_pixelformat_info *
+stw_pixelformat_get_info( uint index );
 
+void
+stw_pixelformat_visual(GLvisual *visual, 
+                       const struct stw_pixelformat_info *pfi );
 
-#endif /* PIXELFORMAT_H */
+#endif /* STW_PIXELFORMAT_H */