Merge remote branch 'origin/master' into pipe-video

[mesa.git] / src / gallium / include / pipe / p_format.h

diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h
index 5ca27b3db28a18c87853a36d9c4742f5f21a3c42..f3b1e5561cf1f3cfb9a99e82e13bd41e5de176eb 100644 (file)
--- a/src/gallium/include/pipe/p_format.h
+++ b/src/gallium/include/pipe/p_format.h
@@ -29,12 +29,20 @@
 #ifndef PIPE_FORMAT_H
 #define PIPE_FORMAT_H
 
-#include "p_compiler.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+
+enum pipe_type {
+   PIPE_TYPE_UNORM = 0,
+   PIPE_TYPE_SNORM,
+   PIPE_TYPE_SINT,
+   PIPE_TYPE_UINT,
+   PIPE_TYPE_FLOAT,
+   PIPE_TYPE_COUNT
+};
+
 /**
  * Texture/surface image formats (preliminary)
  */
@@ -200,6 +208,21 @@ enum pipe_format {
    PIPE_FORMAT_IA44                  = 141,
    PIPE_FORMAT_AI44                  = 142,
 
+   /* some stencil samplers formats */
+   PIPE_FORMAT_X24S8_USCALED           = 143,
+   PIPE_FORMAT_S8X24_USCALED           = 144,
+   PIPE_FORMAT_X32_S8X24_USCALED       = 145,
+
+   PIPE_FORMAT_B2G3R3_UNORM            = 146,
+   PIPE_FORMAT_L16A16_UNORM            = 147,
+   PIPE_FORMAT_A16_UNORM               = 148,
+   PIPE_FORMAT_I16_UNORM               = 149,
+
+   PIPE_FORMAT_LATC1_UNORM             = 143,
+   PIPE_FORMAT_LATC1_SNORM             = 144,
+   PIPE_FORMAT_LATC2_UNORM             = 145,
+   PIPE_FORMAT_LATC2_SNORM             = 146,
+
    PIPE_FORMAT_COUNT
 };